Bug 1216257 - Remove disabled tests and associated strings. r=gbrown
authorMargaret Leibovic <margaret.leibovic@gmail.com>
Fri, 23 Oct 2015 19:03:33 -0400
changeset 271111 a2fd04686fd78e86337bda329dd8668f96c08387
parent 271110 52b8491314efce1263eb6fa338ea333a63116452
child 271112 91c66ca62277413b88b74f6f7fc5176c079afdf2
push id67553
push usercbook@mozilla.com
push dateWed, 04 Nov 2015 11:31:24 +0000
treeherdermozilla-inbound@8868503916ba [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgbrown
bugs1216257
milestone45.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1216257 - Remove disabled tests and associated strings. r=gbrown
mobile/android/tests/browser/robocop/robocop.ini
mobile/android/tests/browser/robocop/src/org/mozilla/gecko/tests/BaseTest.java
mobile/android/tests/browser/robocop/src/org/mozilla/gecko/tests/StringHelper.java
mobile/android/tests/browser/robocop/src/org/mozilla/gecko/tests/testClearPrivateData.java
mobile/android/tests/browser/robocop/src/org/mozilla/gecko/tests/testImportFromAndroid.java
mobile/android/tests/browser/robocop/src/org/mozilla/gecko/tests/testMasterPassword.java
mobile/android/tests/browser/robocop/src/org/mozilla/gecko/tests/testSettingsMenuItems.java
mobile/android/tests/browser/robocop/src/org/mozilla/gecko/tests/testSystemPages.java
mobile/android/tests/browser/robocop/src/org/mozilla/gecko/tests/testTitleBar.java
--- a/mobile/android/tests/browser/robocop/robocop.ini
+++ b/mobile/android/tests/browser/robocop/robocop.ini
@@ -26,52 +26,42 @@ skip-if = android_version == "18"
 skip-if = android_version == "10" || android_version == "18"
 [src/org/mozilla/gecko/tests/testBookmarkFolders.java]
 # disabled on Android 2.3, bug 979552; on 4.3, bug 1144921
 skip-if = android_version == "10" || android_version == "18"
 # [src/org/mozilla/gecko/tests/testBookmarklets.java] # see bug 915350
 # [src/org/mozilla/gecko/tests/testBookmarkKeyword.java] # see bug 915350
 [src/org/mozilla/gecko/tests/testBrowserProvider.java]
 [src/org/mozilla/gecko/tests/testBrowserSearchVisibility.java]
-[src/org/mozilla/gecko/tests/testClearPrivateData.java]
-# disabled on 2.3, bug 948591; on 4.3, bug 1000643
-skip-if = android_version == "10" || android_version == "18"
 [src/org/mozilla/gecko/tests/testDBUtils.java]
 [src/org/mozilla/gecko/tests/testDistribution.java]
 [src/org/mozilla/gecko/tests/testDoorHanger.java]
 # disabled on 2.3, bug 1085609; on 4.3, bug 1144924
 skip-if = android_version == "10" || android_version == "18"
 [src/org/mozilla/gecko/tests/testFilterOpenTab.java]
 # [src/org/mozilla/gecko/tests/testFindInPage.java] # bug 1128287
 [src/org/mozilla/gecko/tests/testFlingCorrectness.java]
 # disabled on 4.3, bug 1144874
 skip-if = android_version == "18"
 [src/org/mozilla/gecko/tests/testFormHistory.java]
 [src/org/mozilla/gecko/tests/testGetUserMedia.java]
 # failures across the board, bug 1092202 & bug 1144926
 skip-if = true
 # [src/org/mozilla/gecko/tests/testHistory.java] # see bug 915350
 [src/org/mozilla/gecko/tests/testHomeBanner.java]
-[src/org/mozilla/gecko/tests/testImportFromAndroid.java]
-# disabled on 2.3 and 4.3 bug 979552
-skip-if = android_version == "10" || android_version == "18"
 [src/org/mozilla/gecko/tests/testInputUrlBar.java]
 # disabled on 2.3 bug 1165511
 skip-if = android_version == "10"
 [src/org/mozilla/gecko/tests/testJarReader.java]
 [src/org/mozilla/gecko/tests/testLinkContextMenu.java]
 # disabled on 4.3, bug 1083666
 skip-if = android_version == "18"
 # [src/org/mozilla/gecko/tests/testHomeListsProvider.java] # see bug 952310
 [src/org/mozilla/gecko/tests/testLoad.java]
 [src/org/mozilla/gecko/tests/testMailToContextMenu.java]
-# [src/org/mozilla/gecko/tests/testMasterPassword.java] disabled for being finicky, see bug 1033013
-# disabled on 2.3; bug 979603
-# disabled on 4.0; bug 1006242
-# skip-if = android_version == "10" || android_version == "15"
 [src/org/mozilla/gecko/tests/testNewTab.java]
 # disabled on 4.3, bug 1145851
 skip-if = android_version == "18"
 [src/org/mozilla/gecko/tests/testPanCorrectness.java]
 # disabled on 4.3, bug 1144874
 skip-if = android_version == "18"
 # [src/org/mozilla/gecko/tests/testPasswordEncrypt.java] # see bug 824067
 [src/org/mozilla/gecko/tests/testPasswordProvider.java]
@@ -90,27 +80,18 @@ skip-if = android_version == "10" || and
 # disabled on 2.3, bug 907768; on 4.3, bug 1145867
 skip-if = android_version == "10" || android_version == "18"
 [src/org/mozilla/gecko/tests/testSessionOOMSave.java]
 # disabled on 2.3, bug 945395; on 4.3, bug 1144888
 skip-if = android_version == "10" || android_version == "18"
 [src/org/mozilla/gecko/tests/testSessionOOMRestore.java]
 # disabled on Android 2.3, bug 979600; on 4.3, bug 1145879
 skip-if = android_version == "10" || android_version == "18"
-[src/org/mozilla/gecko/tests/testSettingsMenuItems.java]
-# disabled on Android 2.3, bug 979552; on 4.3, bug 1144898
-skip-if = android_version == "10" || android_version == "18"
 # [src/org/mozilla/gecko/tests/testShareLink.java] # see bug 915897
-[src/org/mozilla/gecko/tests/testSystemPages.java]
-# disabled on 2.3, bug 979603; on 4.3, bug 1142811
-skip-if = android_version == "10" || android_version == "18"
 # [src/org/mozilla/gecko/tests/testThumbnails.java] # see bug 813107
-[src/org/mozilla/gecko/tests/testTitleBar.java]
-# disabled on Android 2.3, bug 979552; on 4.3, bug 1145881
-skip-if = android_version == "10" || android_version == "18"
 # [src/org/mozilla/gecko/tests/testVkbOverlap.java] # see bug 907274
 
 # Using JavascriptTest
 # (If your test can be written entirely in Javascript, consider writing
 # it as a chrome test instead. See mobile/android/tests/browser/chrome.)
 [src/org/mozilla/gecko/tests/testBrowserDiscovery.java]
 # disabled on 4.3, bug 1158384
 skip-if = android_version == "18"
--- a/mobile/android/tests/browser/robocop/src/org/mozilla/gecko/tests/BaseTest.java
+++ b/mobile/android/tests/browser/robocop/src/org/mozilla/gecko/tests/BaseTest.java
@@ -14,30 +14,27 @@ import java.util.HashSet;
 
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
 import org.mozilla.gecko.Actions;
 import org.mozilla.gecko.Element;
 import org.mozilla.gecko.GeckoAppShell;
-import org.mozilla.gecko.GeckoEvent;
 import org.mozilla.gecko.GeckoProfile;
 import org.mozilla.gecko.GeckoThread;
 import org.mozilla.gecko.R;
 import org.mozilla.gecko.RobocopUtils;
 import org.mozilla.gecko.Tab;
 import org.mozilla.gecko.Tabs;
 
 import android.app.Activity;
 import android.content.ContentValues;
-import android.content.Intent;
 import android.content.pm.ActivityInfo;
 import android.content.res.AssetManager;
-import android.content.res.Resources;
 import android.database.Cursor;
 import android.os.Build;
 import android.os.SystemClock;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentActivity;
 import android.support.v4.app.FragmentManager;
 import android.text.TextUtils;
 import android.util.DisplayMetrics;
@@ -138,24 +135,16 @@ abstract class BaseTest extends BaseRobo
                 mAsserter.dumpLog("Exception caught during test!", t);
                 mAsserter.ok(false, "Exception caught", t.toString());
             }
             // re-throw to continue bail-out
             throw t;
         }
     }
 
-    public void assertMatches(String value, String regex, String name) {
-        if (value == null) {
-            mAsserter.ok(false, name, "Expected /" + regex + "/, got null");
-            return;
-        }
-        mAsserter.ok(value.matches(regex), name, "Expected /" + regex +"/, got \"" + value + "\"");
-    }
-
     /**
      * Click on the URL bar to focus it and enter editing mode.
      */
     protected final void focusUrlBar() {
         // Click on the browser toolbar to enter editing mode
         mSolo.waitForView(R.id.browser_toolbar);
         final View toolbarView = mSolo.getView(R.id.browser_toolbar);
         mSolo.clickOnView(toolbarView);
@@ -295,20 +284,16 @@ abstract class BaseTest extends BaseRobo
         if (!result) {
             // Log timeout failure for diagnostic purposes only; a failed wait may
             // be normal and does not necessarily warrant a test assertion/failure.
             mAsserter.dumpLog("waitForCondition timeout after " + timeout + " ms.");
         }
         return result;
     }
 
-    protected interface BooleanTest {
-        public boolean test();
-    }
-
     public void SqliteCompare(String dbName, String sqlCommand, ContentValues[] cvs) {
         File profile = new File(mProfile);
         String dbPath = new File(profile, dbName).getPath();
 
         Cursor c = mActions.querySql(dbPath, sqlCommand);
         SqliteCompare(c, cvs);
     }
 
@@ -559,22 +544,16 @@ abstract class BaseTest extends BaseRobo
                     button.performClick();
                 }
             });
        } catch (Throwable throwable) {
            mAsserter.ok(false, "Unable to click the button","Was unable to click button ");
        }
     }
 
-    // Used to hide/show the virtual keyboard
-    public void toggleVKB() {
-        InputMethodManager imm = (InputMethodManager) getActivity().getSystemService(Activity.INPUT_METHOD_SERVICE);
-        imm.toggleSoftInput(InputMethodManager.HIDE_IMPLICIT_ONLY, 0);
-    }
-
     public void addTab() {
         mSolo.clickOnView(mSolo.getView(R.id.tabs));
         // wait for addTab to appear (this is usually immediate)
         boolean success = waitForCondition(new Condition() {
             @Override
             public boolean isSatisfied() {
                 View addTabView = mSolo.getView(R.id.add_tab);
                 if (addTabView == null) {
@@ -677,27 +656,16 @@ abstract class BaseTest extends BaseRobo
      * Selects the tab at the specified index.
      *
      * @param index Index of tab to select
      */
     public void selectTabAt(final int index) {
         mSolo.clickOnView(getTabViewAt(index));
     }
 
-    /**
-     * Closes the tab at the specified index.
-     *
-     * @param index Index of tab to close
-     */
-    public void closeTabAt(final int index) {
-        View closeButton = getTabViewAt(index).findViewById(R.id.close);
-
-        mSolo.clickOnView(closeButton);
-    }
-
     public final void runOnUiThreadSync(Runnable runnable) {
         RobocopUtils.runOnUiThreadSync(getActivity(), runnable);
     }
 
     /* Tap the "star" (bookmark) button to bookmark or un-bookmark the current page */
     public void toggleBookmark() {
         mActions.sendSpecialKey(Actions.SpecialKey.MENU);
         waitForText("Settings");
@@ -726,24 +694,16 @@ abstract class BaseTest extends BaseRobo
                 final float x = xy[0] + (viewWidth / 2.0f);
                 float y = xy[1] + (viewHeight / 2.0f);
 
                 mSolo.clickOnScreen(x, y);
             }
         }
     }
 
-    public void clearPrivateData() {
-        selectSettingsItem(mStringHelper.PRIVACY_SECTION_LABEL, mStringHelper.CLEAR_PRIVATE_DATA_LABEL);
-        Actions.EventExpecter clearData = mActions.expectGeckoEvent("Sanitize:Finished");
-        mSolo.clickOnText("Clear data");
-        clearData.blockForEvent();
-        clearData.unregisterListener();
-    }
-
     class Device {
         public final String version; // 2.x or 3.x or 4.x
         public String type; // "tablet" or "phone"
         public final int width;
         public final int height;
         public final float density;
 
         public Device() {
@@ -769,24 +729,16 @@ abstract class BaseTest extends BaseRobo
             try {
                 if (GeckoAppShell.isTablet()) {
                     type = "tablet";
                 }
             } catch (Exception e) {
                 mAsserter.dumpLog("Exception in detectDevice", e);
             }
         }
-
-        public void rotate() {
-            if (getActivity().getRequestedOrientation () == ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE) {
-                mSolo.setActivityOrientation(Solo.PORTRAIT);
-            } else {
-                mSolo.setActivityOrientation(Solo.LANDSCAPE);
-            }
-        }
     }
 
     class Navigation {
         private final String devType;
         private final String osVersion;
 
         public Navigation(Device mDevice) {
             devType = mDevice.type;
@@ -824,33 +776,16 @@ abstract class BaseTest extends BaseRobo
                 }
                 ensureMenuClosed();
             }
 
             pageShowExpecter.blockForEvent();
             pageShowExpecter.unregisterListener();
         }
 
-        public void reload() {
-            if (devType.equals("tablet")) {
-                mSolo.waitForView(R.id.reload);
-                mSolo.clickOnView(mSolo.getView(R.id.reload));
-            } else {
-                mActions.sendSpecialKey(Actions.SpecialKey.MENU);
-                waitForText("^New Tab$");
-                if (!osVersion.equals("2.x")) {
-                    mSolo.waitForView(R.id.reload);
-                    mSolo.clickOnView(mSolo.getView(R.id.reload));
-                } else {
-                    mSolo.clickOnText("^Reload$");
-                }
-                ensureMenuClosed();
-            }
-        }
-
         // DEPRECATED!
         // Use BaseTest.toggleBookmark() in new code.
         public void bookmark() {
             mActions.sendSpecialKey(Actions.SpecialKey.MENU);
             waitForText("^New Tab$");
             if (mSolo.searchText("^Bookmark$")) {
                 // This is the Android 2.x so the button has text
                 mSolo.clickOnText("^Bookmark$");
--- a/mobile/android/tests/browser/robocop/src/org/mozilla/gecko/tests/StringHelper.java
+++ b/mobile/android/tests/browser/robocop/src/org/mozilla/gecko/tests/StringHelper.java
@@ -95,116 +95,39 @@ public class StringHelper {
 
     private final String ROBOCOP_JS_HARNESS_URL = "/robocop/robocop_javascript.html";
 
     // Robocop page titles
     public final String ROBOCOP_BIG_LINK_TITLE = "Big Link";
     public final String ROBOCOP_BIG_MAILTO_TITLE = "Big Mailto";
     public final String ROBOCOP_BLANK_PAGE_01_TITLE = "Browser Blank Page 01";
     public final String ROBOCOP_BLANK_PAGE_02_TITLE = "Browser Blank Page 02";
-    public final String ROBOCOP_BLANK_PAGE_03_TITLE = "Browser Blank Page 03";
-    public final String ROBOCOP_BLANK_PAGE_04_TITLE = "Browser Blank Page 04";
-    public final String ROBOCOP_BLANK_PAGE_05_TITLE = "Browser Blank Page 05";
-    public final String ROBOCOP_BOXES_TITLE = "Browser Box test";
     public final String ROBOCOP_GEOLOCATION_TITLE = "Geolocation Test Page";
-    public final String ROBOCOP_LOGIN_TITLE = "Robocop Login";
-    public final String ROBOCOP_OFFLINE_STORAGE_TITLE = "Robocop offline storage";
     public final String ROBOCOP_PICTURE_LINK_TITLE = "Picture Link";
     public final String ROBOCOP_SEARCH_TITLE = "Robocop Search Engine";
-    public final String ROBOCOP_TEXT_PAGE_TITLE = "Robocop Text Page";
-    public final String ROBOCOP_INPUT_TITLE = "Robocop Input";
 
     // Distribution tile labels
     public final String DISTRIBUTION1_LABEL = "Distribution 1";
     public final String DISTRIBUTION2_LABEL = "Distribution 2";
 
-    // Import strings
-    public final String BOOKMARKS;
-    public final String IMPORT;
-
     // Settings menu strings
-    // Section labels - ordered as found in the settings menu
-    public final String CUSTOMIZE_SECTION_LABEL;
-    public final String DISPLAY_SECTION_LABEL;
     public final String PRIVACY_SECTION_LABEL;
     public final String MOZILLA_SECTION_LABEL;
-    public final String DEVELOPER_TOOLS_SECTION_LABEL;
-
-    // Option labels
-    // Customize
-    public final String SYNC_LABEL;
-    public final String IMPORT_FROM_ANDROID_LABEL;
-    public final String TABS_LABEL;
-
-    // Display
-    public final String TEXT_SIZE_LABEL;
-    public final String TITLE_BAR_LABEL = "Title bar";
-    public final String SCROLL_TITLE_BAR_LABEL;
-    public final String VOICE_INPUT_TITLE_LABEL;
-    public final String VOICE_INPUT_SUMMARY_LABEL;
-    public final String QRCODE_INPUT_TITLE_LABEL;
-    public final String QRCODE_INPUT_SUMMARY_LABEL;
-    public final String CHARACTER_ENCODING_LABEL;
-    public final String PLUGINS_LABEL;
-
-    // Title bar
-    public final String SHOW_PAGE_TITLE_LABEL = "Show page title";
-    public final String SHOW_PAGE_ADDRESS_LABEL = "Show page address";
-
-    // Privacy
-    public final String TRACKING_PROTECTION_LABEL;
-    public final String TRACKING_PROTECTION_PROMPT_TITLE;
-    public final String TRACKING_PROTECTION_PROMPT_BUTTON;
-    public final String DNT_LABEL;
-    public final String COOKIES_LABEL;
-    public final String REMEMBER_LOGINS_LABEL;
-    public final String MANAGE_LOGINS_LABEL;
-    public final String MASTER_PASSWORD_LABEL;
-    public final String CLEAR_PRIVATE_DATA_LABEL;
-    public final String ENABLED_EXCLUDE_3RD_PARTY;
-    public final String BROWSING_HISTORY;
-    public final String SEARCH_HISTORY;
-    public final String DOWNLOADS;
-    public final String FORM_HISTORY;
-    public final String COOKIES_AND_LOGINS;
-    public final String CACHE;
-    public final String OFFLINE_DATA;
-    public final String SITE_SETTINGS;
-    public final String CLEAR_DATA_BUTTON;
 
     // Mozilla
     public final String BRAND_NAME = "(Fennec|Nightly|Aurora|Firefox Beta|Firefox)";
     public final String ABOUT_LABEL = "About " + BRAND_NAME ;
-    public final String FAQS_LABEL;
-    public final String FEEDBACK_LABEL;
     public final String LOCATION_SERVICES_LABEL = "Mozilla Location Service";
-    public final String HEALTH_REPORT_LABEL = BRAND_NAME + " Health Report";
-    public final String MY_HEALTH_REPORT_LABEL;
-    public final String DATA_CHOICES;
-    public final String HEALTH_REPORT_EXPLANATION;
-    public final String MOZ_LOCATION;
-    public final String MOZ_LOCATION_MSG;
-    public final String LEARN_MORE;
-    public final String CRASH_REPORTER;
-    public final String CRASH_REPORTER_MSG;
-    public final String TELEMETRY;
-    public final String TELEMETRY_MSG;
-
-    // Developer tools
-    public final String REMOTE_DEBUGGING_USB_LABEL;
-    public final String REMOTE_DEBUGGING_WIFI_LABEL;
-    public final String LEARN_MORE_LABEL;
 
     // Labels for the about:home tabs
     public final String HISTORY_LABEL;
     public final String TOP_SITES_LABEL;
     public final String BOOKMARKS_LABEL;
     public final String READING_LIST_LABEL;
     public final String TODAY_LABEL;
-    public final String TABS_FROM_LAST_TIME_LABEL = "Open all tabs from last time";
 
     // Desktop default bookmarks folders
     public final String BOOKMARKS_UP_TO;
     public final String BOOKMARKS_ROOT_LABEL;
     public final String DESKTOP_FOLDER_LABEL;
     public final String TOOLBAR_FOLDER_LABEL;
     public final String BOOKMARKS_MENU_FOLDER_LABEL;
     public final String UNSORTED_FOLDER_LABEL;
@@ -358,83 +281,19 @@ public class StringHelper {
                 CONTEXT_MENU_SHARE,
                 CONTEXT_MENU_COPY_ADDRESS,
                 CONTEXT_MENU_EDIT_SITE_SETTINGS,
                 CONTEXT_MENU_ADD_TO_HOME_SCREEN
         };
 
         TITLE_PLACE_HOLDER = res.getString(R.string.url_bar_default_text);
 
-        // Import strings
-        IMPORT = res.getString(R.string.bookmarkhistory_button_import);
-        BOOKMARKS = res.getString(R.string.bookmarks_title);
-
         // Settings menu strings
-        // Section labels - ordered as found in the settings menu
-        CUSTOMIZE_SECTION_LABEL = res.getString(R.string.pref_category_customize);
-        DISPLAY_SECTION_LABEL = res.getString(R.string.pref_category_display);
         PRIVACY_SECTION_LABEL = res.getString(R.string.pref_category_privacy_short);
         MOZILLA_SECTION_LABEL = res.getString(R.string.pref_category_vendor);
-        DEVELOPER_TOOLS_SECTION_LABEL = res.getString(R.string.pref_category_devtools);
-
-        // Option labels
-        // Customize
-        SYNC_LABEL = res.getString(R.string.pref_sync);
-        IMPORT_FROM_ANDROID_LABEL = res.getString(R.string.pref_import_android);
-        TABS_LABEL = res.getString(R.string.pref_restore);
-
-        // Display
-        TEXT_SIZE_LABEL = res.getString(R.string.pref_text_size);
-        SCROLL_TITLE_BAR_LABEL = res.getString(R.string.pref_scroll_title_bar2);
-        VOICE_INPUT_TITLE_LABEL = res.getString(R.string.pref_voice_input);
-        VOICE_INPUT_SUMMARY_LABEL = res.getString(R.string.pref_voice_input_summary);
-        QRCODE_INPUT_TITLE_LABEL = res.getString(R.string.pref_qrcode_enabled);
-        QRCODE_INPUT_SUMMARY_LABEL = res.getString(R.string.pref_qrcode_enabled_summary);
-        CHARACTER_ENCODING_LABEL = res.getString(R.string.pref_char_encoding);
-        PLUGINS_LABEL = res.getString(R.string.pref_plugins);
-
-        // Privacy
-        TRACKING_PROTECTION_LABEL = res.getString(R.string.pref_tracking_protection_title);
-        TRACKING_PROTECTION_PROMPT_TITLE = res.getString(R.string.tracking_protection_prompt_title);
-        TRACKING_PROTECTION_PROMPT_BUTTON = res.getString(R.string.tracking_protection_prompt_action_button);
-        DNT_LABEL = res.getString(R.string.pref_donottrack_title);
-        COOKIES_LABEL = res.getString(R.string.pref_cookies_menu);
-        REMEMBER_LOGINS_LABEL = res.getString(R.string.pref_remember_signons);
-        MANAGE_LOGINS_LABEL = res.getString(R.string.pref_manage_logins);
-        MASTER_PASSWORD_LABEL = res.getString(R.string.pref_use_master_password);
-        CLEAR_PRIVATE_DATA_LABEL = res.getString(R.string.pref_clear_private_data);
-        ENABLED_EXCLUDE_3RD_PARTY = res.getString(R.string.pref_cookies_not_accept_foreign);
-        BROWSING_HISTORY = res.getString(R.string.pref_private_data_history2);
-        SEARCH_HISTORY = res.getString(R.string.pref_private_data_searchHistory);
-        DOWNLOADS = res.getString(R.string.pref_private_data_downloadFiles2);
-        FORM_HISTORY = res.getString(R.string.pref_private_data_formdata2);
-        COOKIES_AND_LOGINS = res.getString(R.string.pref_private_data_cookies2);
-        CACHE = res.getString(R.string.pref_private_data_cache);
-        OFFLINE_DATA = res.getString(R.string.pref_private_data_offlineApps);
-        SITE_SETTINGS = res.getString(R.string.pref_private_data_siteSettings);
-        CLEAR_DATA_BUTTON = res.getString(R.string.button_clear_data);
-
-        // Mozilla
-        FAQS_LABEL = res.getString(R.string.pref_vendor_faqs);
-        FEEDBACK_LABEL = res.getString(R.string.pref_vendor_feedback);
-        DATA_CHOICES = res.getString(R.string.pref_category_datareporting);
-        MY_HEALTH_REPORT_LABEL = res.getString(R.string.datareporting_abouthr_title);
-        HEALTH_REPORT_EXPLANATION = res.getString(R.string.datareporting_fhr_summary2);
-        MOZ_LOCATION = res.getString(R.string.datareporting_wifi_title);
-        MOZ_LOCATION_MSG = res.getString(R.string.datareporting_wifi_geolocation_summary);
-        LEARN_MORE = res.getString(R.string.pref_learn_more);
-        CRASH_REPORTER = res.getString(R.string.datareporting_crashreporter_title_short);
-        CRASH_REPORTER_MSG = res.getString(R.string.datareporting_crashreporter_summary);
-        TELEMETRY = res.getString(R.string.datareporting_telemetry_title);
-        TELEMETRY_MSG = res.getString(R.string.datareporting_telemetry_summary);
-
-        // Developer tools
-        REMOTE_DEBUGGING_USB_LABEL = res.getString(R.string.pref_developer_remotedebugging_usb);
-        REMOTE_DEBUGGING_WIFI_LABEL = res.getString(R.string.pref_developer_remotedebugging_wifi);
-        LEARN_MORE_LABEL = res.getString(R.string.pref_learn_more);
 
         // Labels for the about:home tabs
         HISTORY_LABEL = res.getString(R.string.home_history_title);
         TOP_SITES_LABEL = res.getString(R.string.home_top_sites_title);
         BOOKMARKS_LABEL = res.getString(R.string.bookmarks_title);
         READING_LIST_LABEL = res.getString(R.string.reading_list_title);
         TODAY_LABEL = res.getString(R.string.history_today_section);
 
deleted file mode 100644
--- a/mobile/android/tests/browser/robocop/src/org/mozilla/gecko/tests/testClearPrivateData.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-package org.mozilla.gecko.tests;
-
-import org.mozilla.gecko.R;
-
-import com.jayway.android.robotium.solo.Condition;
-import android.view.View;
-import android.widget.ImageView;
-
-/**
- * This patch tests the clear private data options:
- * - clear history option by: adding and checking that clear private
- * data option removes the history items but not the users bookmarks
- * - clear site settings and clear saved password by: checking
- * each option present in the doorhanger and clearing the settings from
- * the URL bar context menu and settings menu
- */
-
-public class testClearPrivateData extends PixelTest {
-    private final int TEST_WAIT_MS = 10000;
-
-    public void testClearPrivateData() {
-        blockForGeckoReady();
-        clearHistory();
-        clearSiteSettings();
-        clearPassword();
-    }
-
-    private void clearHistory() {
-
-        // Loading a page and adding a second one as bookmark to have user made bookmarks and history
-        String blank1 = getAbsoluteUrl(mStringHelper.ROBOCOP_BLANK_PAGE_01_URL);
-        String blank2 = getAbsoluteUrl(mStringHelper.ROBOCOP_BLANK_PAGE_02_URL);
-        String title = mStringHelper.ROBOCOP_BLANK_PAGE_01_TITLE;
-
-        loadUrlAndWait(blank1);
-        verifyUrlBarTitle(blank1);
-        mDatabaseHelper.addMobileBookmark(mStringHelper.ROBOCOP_BLANK_PAGE_02_TITLE, blank2);
-
-        // Checking that the history list is not empty
-        verifyHistoryCount(1);
-
-        //clear and check for device
-        checkDevice(title, blank1);
-
-        // Checking that history list is empty
-        verifyHistoryCount(0);
-
-        // Checking that the user made bookmark is not removed
-        mAsserter.ok(mDatabaseHelper.isBookmark(blank2), "Checking that bookmarks have not been removed", "User made bookmarks were not removed with private data");
-    }
-
-    private void verifyHistoryCount(final int expectedCount) {
-        boolean match = waitForCondition(new Condition() {
-            @Override
-            public boolean isSatisfied() {
-                return mDatabaseHelper.getBrowserDBUrls(DatabaseHelper.BrowserDataType.HISTORY).size() == expectedCount;
-            }
-        }, TEST_WAIT_MS);
-        mAsserter.ok(match, "Checking that the number of history items is correct", String.valueOf(expectedCount) + " history items present in the database");
-    }
-
-    public void clearSiteSettings() {
-        String titleGeolocation = mStringHelper.ROBOCOP_GEOLOCATION_TITLE;
-        String url = getAbsoluteUrl(mStringHelper.ROBOCOP_GEOLOCATION_URL);
-        loadCheckDismiss(mStringHelper.GEO_ALLOW, url, mStringHelper.GEO_MESSAGE);
-        checkOption(mStringHelper.GEO_ALLOW, mStringHelper.CLEAR);
-        loadCheckDismiss(mStringHelper.GEO_DENY, url, mStringHelper.GEO_MESSAGE);
-        checkOption(mStringHelper.GEO_DENY, mStringHelper.CANCEL);
-        checkDevice(titleGeolocation, url);
-    }
-
-    public void clearPassword(){
-        String passwordStrings[] = { mStringHelper.LOGIN_MESSAGE, mStringHelper.LOGIN_ALLOW, mStringHelper.LOGIN_DENY };
-        String title = mStringHelper.ROBOCOP_BLANK_PAGE_01_TITLE;
-        String loginUrl = getAbsoluteUrl(mStringHelper.ROBOCOP_LOGIN_01_URL);
-
-        loadCheckDismiss(passwordStrings[1], loginUrl, passwordStrings[0]);
-        checkOption(mStringHelper.CONTEXT_MENU_SITE_SETTINGS_SAVE_PASSWORD, mStringHelper.CLEAR);
-        loadCheckDismiss(passwordStrings[2], loginUrl, passwordStrings[0]);
-        checkDevice(title, getAbsoluteUrl(mStringHelper.ROBOCOP_BLANK_PAGE_01_URL));
-    }
-
-    // clear private data and verify the device type because for phone there is an extra back action to exit the settings menu
-    public void checkDevice(final String title, final String url) {
-        clearPrivateData();
-        if (mDevice.type.equals("phone")) {
-            mSolo.goBack();
-            mAsserter.ok(waitForText(mStringHelper.PRIVACY_SECTION_LABEL), "waiting to perform one back", "one back");
-        }
-        mSolo.goBack();
-        verifyUrlBarTitle(url);
-    }
-
-    // Load a URL, verify that the doorhanger appears and dismiss it
-    public void loadCheckDismiss(String option, String url, String message) {
-        loadUrlAndWait(url);
-        waitForText(message);
-        mAsserter.is(mSolo.searchText(message), true, "Doorhanger:" + message + " has been displayed");
-        mSolo.clickOnButton(option);
-        mAsserter.is(mSolo.searchText(message), false, "Doorhanger:" + message + " has been hidden");
-    }
-
-    //Verify if there are settings to be clear if so clear them from the URL bar context menu
-    public void checkOption(String option, String button) {
-        if (mDevice.version.equals("2.x")) {
-            // Use the context menu in pre-11
-            final View toolbarView = mSolo.getView(R.id.browser_toolbar);
-            mSolo.clickLongOnView(toolbarView);
-            mAsserter.ok(waitForText(mStringHelper.CONTEXT_MENU_ITEMS_IN_URL_BAR[2]), "Waiting for the pop-up to open", "Pop up was opened");
-        } else {
-            // Use the Page menu in 11+
-            openSiteSecurityDoorHanger();
-            mAsserter.ok(waitForText(mStringHelper.CONTEXT_MENU_ITEMS_IN_URL_BAR[2]), "Waiting for the submenu to open for " + option + " on " + button, "Submenu was opened");
-        }
-
-        mSolo.clickOnText(mStringHelper.CONTEXT_MENU_ITEMS_IN_URL_BAR[2]);
-        mAsserter.ok(waitForText(option), "Verify that the option: " + option + " is in the list", "The option is in the list. There are settings to clear");
-        mSolo.clickOnButton(button);
-    }
-
-    private void openSiteSecurityDoorHanger() {
-        mSolo.waitForCondition(new Condition() {
-            @Override
-            public boolean isSatisfied() {
-                ImageView btn = (ImageView) mSolo.getView(R.id.favicon);
-                mSolo.clickOnView(btn);
-                return true;
-            }
-        }, TEST_WAIT_MS);
-    }
-}
deleted file mode 100644
--- a/mobile/android/tests/browser/robocop/src/org/mozilla/gecko/tests/testImportFromAndroid.java
+++ /dev/null
@@ -1,230 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-package org.mozilla.gecko.tests;
-
-import java.util.ArrayList;
-
-import org.mozilla.gecko.AppConstants;
-import org.mozilla.gecko.GeckoProfile;
-
-import android.content.ContentResolver;
-import android.content.ContentValues;
-import android.database.Cursor;
-import android.net.Uri;
-import android.provider.Browser;
-
-import com.jayway.android.robotium.solo.Condition;
-
-/**
-  * This test covers the Import from Android feature
-  * The test will save the existing bookmarks and history then will do an Import
-  * After the import it will check that the bookmarks and history items from Android are imported
-  * Then it will test that the old data from Firefox is not lost
-  * At the end will test that a second import will not duplicate information
-  */
-
-public class testImportFromAndroid extends AboutHomeTest {
-    private static final int MAX_WAIT_TIMEOUT = 15000;
-    ArrayList<String> androidData = new ArrayList<String>();
-    ArrayList<String> firefoxHistory = new ArrayList<String>();
-
-    public void testImportFromAndroid() {
-        ArrayList<String> firefoxBookmarks = new ArrayList<String>();
-        ArrayList<String> oldFirefoxHistory = new ArrayList<String>();
-        ArrayList<String> oldFirefoxBookmarks = new ArrayList<String>();
-        blockForGeckoReady();
-
-        // Get the Android history
-        androidData = getAndroidUrls("history");
-
-        // Add some overlapping data from the Android Stock Browser to Firefox before import
-        addData();
-
-        // Get the initial bookmarks and history
-        oldFirefoxBookmarks = mDatabaseHelper.getBrowserDBUrls(DatabaseHelper.BrowserDataType.BOOKMARKS);
-        oldFirefoxHistory = mDatabaseHelper.getBrowserDBUrls(DatabaseHelper.BrowserDataType.HISTORY);
-
-        // Import the bookmarks and history
-        importDataFromAndroid();
-
-        // Get the Android history and the Firefox bookmarks and history lists
-        firefoxHistory = mDatabaseHelper.getBrowserDBUrls(DatabaseHelper.BrowserDataType.HISTORY);
-        firefoxBookmarks = mDatabaseHelper.getBrowserDBUrls(DatabaseHelper.BrowserDataType.BOOKMARKS);
-
-        /**
-         * Add a delay to make sure the imported items are added to the array lists
-         * if there are a lot of history items in the Android Browser database
-         */
-        boolean success = waitForCondition(new Condition() {
-            @Override
-            public boolean isSatisfied() {
-                if (androidData.size() <= firefoxHistory.size()) {
-                    return true;
-                } else {
-                    return false;
-                }
-            }
-        }, MAX_WAIT_MS);
-
-        /**
-         * Verify the history and bookmarks are imported
-         * Android history also contains the android bookmarks so we don't need to get them separately here
-         */
-        for (String url:androidData) {
-            mAsserter.ok(firefoxHistory.contains(url)||firefoxBookmarks.contains(url), "Checking if Android" + (firefoxBookmarks.contains(url) ? " Bookmark" : " History item") + " is present", url + " was imported");
-        }
-
-        // Verify the original Firefox Bookmarks are not deleted
-        for (String url:oldFirefoxBookmarks) {
-             mAsserter.ok(firefoxBookmarks.contains(url), "Checking if original Firefox Bookmark is present", " Firefox Bookmark " + url + " was not removed");
-        }
-
-        // Verify the original Firefox History is not deleted
-        for (String url:oldFirefoxHistory) {
-             mAsserter.ok(firefoxHistory.contains(url), "Checking original Firefox History item is present", " Firefox History item " + url + " was not removed");
-        }
-
-        // Import data again and make sure bookmarks are not duplicated
-        importDataFromAndroid();
-
-        // Verify bookmarks are not duplicated
-        ArrayList<String> verifiedBookmarks = new ArrayList<String>();
-        firefoxBookmarks = mDatabaseHelper.getBrowserDBUrls(DatabaseHelper.BrowserDataType.BOOKMARKS);
-        for (String url:firefoxBookmarks) {
-             if (verifiedBookmarks.contains(url)) {
-                 mAsserter.ok(false, "Bookmark " + url + " should not be duplicated", "Bookmark is duplicated");
-             } else {
-                 verifiedBookmarks.add(url);
-                 mAsserter.ok(true, "Bookmark " + url + " was not duplicated", "Bookmark is unique");
-             }
-        }
-
-        // Verify history count is not increased after the second import
-        mAsserter.ok(firefoxHistory.size() == mDatabaseHelper.getBrowserDBUrls(DatabaseHelper.BrowserDataType.HISTORY).size(), "The number of history entries was not increased", "None of the items were duplicated");
-    }
-
-    private void addData() {
-        ArrayList<String> androidBookmarks = getAndroidUrls("bookmarks");
-
-        // Add a few Bookmarks from Android to Firefox Mobile
-        for (String url:androidBookmarks) {
-            // Add every 3rd bookmark to Firefox Mobile
-            if ((androidBookmarks.indexOf(url) % 3) == 0) {
-                mDatabaseHelper.addMobileBookmark("Bookmark Number" + String.valueOf(androidBookmarks.indexOf(url)), url);
-            }
-        }
-
-        // Add a few history items in Firefox Mobile
-        ContentResolver resolver = getActivity().getContentResolver();
-        Uri uri = Uri.parse("content://" + AppConstants.ANDROID_PACKAGE_NAME + ".db.browser/history");
-        uri = uri.buildUpon().appendQueryParameter("profile", GeckoProfile.DEFAULT_PROFILE)
-                             .appendQueryParameter("sync", "true").build();
-        for (String url:androidData) {
-            // Add every 3rd website from Android History to Firefox Mobile
-            if ((androidData.indexOf(url) % 3) == 0) {
-                 ContentValues values = new ContentValues();
-                 values.put("title", "Page" + url);
-                 values.put("url", url);
-                 values.put("date", System.currentTimeMillis());
-                 values.put("visits", androidData.indexOf(url));
-                 resolver.insert(uri, values);
-            }
-        }
-    }
-
-    private void importDataFromAndroid() {
-        waitForText(mStringHelper.TITLE_PLACE_HOLDER);
-        selectSettingsItem(mStringHelper.CUSTOMIZE_SECTION_LABEL, mStringHelper.IMPORT_FROM_ANDROID_LABEL);
-
-        // Wait for the Import form Android pop-up to be opened. It has the same title as the option so waiting for the "Cancel" button
-        waitForText("Cancel");
-        mSolo.clickOnButton("Import");
-
-        // Wait until the import pop-up is dismissed. This depending on the number of items in the android history can take up to a few seconds
-        boolean importComplete = waitForCondition(new Condition() {
-            @Override
-            public boolean isSatisfied() {
-                return !mSolo.searchText("Please wait...");
-            }
-        }, MAX_WAIT_TIMEOUT);
-
-        mAsserter.ok(importComplete, "Waiting for import to finish and the pop-up to be dismissed", "Import was completed and the pop-up was dismissed");
-
-        // Import has finished. Waiting to get back to the Settings Menu and looking for the Import&Export subsection
-        if ("phone".equals(mDevice.type)) {
-            // Phones don't have headers like tablets, so we need to pop up one more level.
-            waitForText(mStringHelper.IMPORT_FROM_ANDROID_LABEL);
-            mSolo.goBack();
-        }
-        waitForText(mStringHelper.PRIVACY_SECTION_LABEL); // Settings is a header for the settings menu page. Waiting for Privacy ensures we are back in the top Settings view
-        mSolo.goBack(); // Exit Settings
-        // Make sure the settings menu has been closed.
-        mAsserter.ok(mSolo.waitForText(mStringHelper.TITLE_PLACE_HOLDER), "Waiting for search bar", "Search bar found");
-
-    }
-
-    public ArrayList<String> getAndroidUrls(String data) {
-        // Return bookmarks or history depending on what the user asks for
-        ArrayList<String> urls = new ArrayList<String>();
-        ContentResolver resolver = getActivity().getContentResolver();
-        Cursor cursor = null;
-        try {
-            if (data.equals("history")) {
-                cursor = getAllVisitedUrls(resolver);
-            } else if (data.equals("bookmarks")) {
-                cursor = getAllBookmarks(resolver);
-            }
-            if (cursor != null) {
-                cursor.moveToFirst();
-                for (int i = 0; i < cursor.getCount(); i++ ) {
-                     urls.add(cursor.getString(cursor.getColumnIndex("url")));
-                     if(!cursor.isLast()) {
-                        cursor.moveToNext();
-                     }
-                }
-            }
-        } finally {
-            if (cursor != null) {
-                cursor.close();
-            }
-        }
-        return urls;
-    }
-
-    public void deleteImportedData() {
-        // Bookmarks
-        ArrayList<String> androidBookmarks = getAndroidUrls("bookmarks");
-        for (String url:androidBookmarks) {
-             mDatabaseHelper.deleteBookmark(url);
-        }
-        // History
-        for (String url:androidData) {
-             mDatabaseHelper.deleteHistoryItem(url);
-        }
-    }
-
-    private static Cursor getAllVisitedUrls(ContentResolver resolver) {
-        final Uri authorityUri = Uri.parse("content://com.android.browser");
-        final Uri contentUri = Uri.withAppendedPath(authorityUri, "combined");
-
-        return resolver.query(contentUri,
-                new String[] { "url" }, null, null,
-                "created ASC");
-    }
-
-    private static Cursor getAllBookmarks(ContentResolver resolver) {
-        final Uri bookmarksUri = Uri.parse("content://browser/bookmarks");
-
-        return resolver.query(bookmarksUri,
-            new String[] { "url" },
-            "folder = 0", null, null);
-    }
-
-    @Override
-    public void tearDown() throws Exception {
-        deleteImportedData();
-        super.tearDown();
-    }
-}
deleted file mode 100644
--- a/mobile/android/tests/browser/robocop/src/org/mozilla/gecko/tests/testMasterPassword.java
+++ /dev/null
@@ -1,230 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-package org.mozilla.gecko.tests;
-
-import org.mozilla.gecko.Actions;
-
-/* This patch tests the Master Password feature first by enabling the password,
-then testing it on a login page and finally disabling the password */
-public class testMasterPassword extends PixelTest {
-    Device dev;
-
-    public void testMasterPassword() {
-        blockForGeckoReady();
-
-        dev = new Device();
-        String password = ("Good");
-        String badPassword = ("Bad");
-
-        enableMasterPassword(password, badPassword);
-        verifyLoginPage(password, badPassword);
-        disableMasterPassword(password, badPassword);
-    }
-
-    public void enableMasterPassword(String password, String badPassword) {
-
-        // Look for the 'Settings' menu if this device/OS uses it
-        selectSettingsItem(mStringHelper.PRIVACY_SECTION_LABEL, mStringHelper.MASTER_PASSWORD_LABEL);
-        waitForText("^Create Master Password$");
-
-        // Verify that the OK button is not activated until both fields are filled
-        closeTabletKeyboard();
-        mAsserter.ok(!mSolo.getButton("OK").isEnabled(), "Verify if the OK button is inactive", "The OK button is inactive until both fields are filled");
-
-        // Verify that the OK button is not activated until the Confirm password field is filled
-        editPasswordField(0, password);
-        mAsserter.ok(!mSolo.getButton("OK").isEnabled(), "Verify if the OK button is inactive", "The OK button is inactive until the Confirm password field is filled");
-
-        // Verify that the OK button is not activated until both fields contain the same password
-        editPasswordField(1, badPassword);
-        mAsserter.ok(!mSolo.getButton("OK").isEnabled(), "Verify if the OK button is inactive", "The OK button is inactive until both fields contain the same password");
-
-        // Verify that the OK button is not activated until the Password field is filled
-        mSolo.clearEditText(0);
-        mAsserter.ok(!mSolo.getButton("OK").isEnabled(), "Verify if the OK button is inactive", "The OK button is inactive until the Password field is filled");
-
-        // Check that the Master Password is not set when canceling the action
-        mSolo.clickOnEditText(0);
-        mActions.sendKeys(password);
-        mSolo.clearEditText(1);
-        mSolo.clickOnEditText(1);
-        mActions.sendKeys(password);
-        waitForText("^Cancel$");
-        mSolo.clickOnText("^Cancel$");
-        waitForText("^" + mStringHelper.MASTER_PASSWORD_LABEL + "$");
-        mSolo.clickOnText("^" + mStringHelper.MASTER_PASSWORD_LABEL + "$");
-        mAsserter.ok(mSolo.waitForText("^Create Master Password$"), "Checking if no password was set if the action was canceled", "No password was set");
-
-        // Enable Master Password
-        mSolo.clickOnEditText(0);
-        mActions.sendKeys(password);
-        mSolo.clickOnEditText(1);
-        mActions.sendKeys(password);
-
-        // Verify that the input characters are converted to dots automatically
-        mAsserter.ok(waitForText("."), "waiting to convert the letters in dots", "The letters are converted in dots");
-        mSolo.clickOnButton("OK");
-
-        // Verify that the Master Password was set
-        mSolo.searchText("Privacy");
-        mAsserter.ok(mSolo.waitForText("^Use master password$"), "Checking if Use master password is present", "Use master password is present");
-        mSolo.clickOnText("^Use master password$");
-        mAsserter.ok(mSolo.waitForText("Remove Master Password"), "Checking if the password is enabled", "The password is enabled");
-        clickOnButton("Cancel"); // Go back to settings menu
-
-        if ("phone".equals(mDevice.type)) {
-            // Phones don't have headers like tablets, so we need to pop up one more level.
-            waitForText("Use master password");
-            mSolo.goBack();
-        }
-        waitForText(mStringHelper.SETTINGS_LABEL);
-        mSolo.goBack();// Close the Settings Menu
-    }
-
-    public void disableMasterPassword(String password, String badPassword) {
-
-        // Look for the 'Settings' menu if this device/OS uses it
-        selectSettingsItem(mStringHelper.PRIVACY_SECTION_LABEL, mStringHelper.MASTER_PASSWORD_LABEL);
-        waitForText("^Remove Master Password$");
-
-        // Verify that the OK button is not activated if the password field is empty
-        closeTabletKeyboard();
-        mAsserter.ok(!mSolo.getButton("OK").isEnabled(), "Verify if the OK button is inactive", "The OK button is inactive if the password field is empty");
-
-        // Verify that the OK button is activated if the password field contains characters
-        editPasswordField(0, badPassword);
-        mAsserter.ok(mSolo.getButton("OK").isEnabled(), "Verify if the OK button is activated", "The OK button is activated even if the wrong password is filled");
-        mSolo.clickOnButton("OK");
-        mAsserter.ok(mSolo.waitForText("^Incorrect password$"), "Waiting for Incorrect password notification", "The Incorrect password notification appears");
-
-        // Disable Master Password
-        mSolo.clickOnText("^Use master password$");
-        waitForText("^Remove Master Password$");
-        closeTabletKeyboard();
-        editPasswordField(0, password);
-        mSolo.clickOnButton("OK");
-
-        // Verify that the Master Password was disabled
-        mSolo.searchText("Privacy");
-        mAsserter.ok(mSolo.waitForText("^Use master password$"), "Checking if Use master password is present", "Use master password is present");
-        mSolo.clickOnText("^Use master password$");
-        mAsserter.ok(waitForText("^Create Master Password$"), "Checking if the password is disabled", "The password is disabled");
-        clickOnButton("Cancel"); // Go back to settings menu
-    }
-
-    public void editPasswordField(int i, String password) {
-        mSolo.clickOnEditText(i);
-        mActions.sendKeys(password);
-        toggleVKB(); // Don't use BACK; this will close the password dialog on devices with hardware keyboard.
-    }
-
-    public void noDoorhangerDisplayed(String LOGIN_URL) {
-        waitForText("Browser Blank Page 01|Enter Search or Address");
-        inputAndLoadUrl(LOGIN_URL);
-        mAsserter.is(waitForText("Save password for"), false, "Doorhanger notification is hidden");
-    }
-
-    public void doorhangerDisplayed(String LOGIN_URL) {
-        waitForText("Browser Blank Page 01|Enter Search or Address");
-        inputAndLoadUrl(LOGIN_URL);
-        mAsserter.is(mSolo.waitForText("Save password for"), true, "Doorhanger notification is displayed");
-    }
-
-    // Checks to see if the device is a Tablet, because for those devices we need an extra back action to close the keyboard
-    public void closeTabletKeyboard() {
-        if (dev.type.equals("tablet")) {
-            mSolo.sleep(1500);
-            toggleVKB();// Close the keyboard for tablets
-        }
-    }
-
-    @Override
-    public void clearPrivateData() {
-
-        // Look for the 'Settings' menu if this device/OS uses it
-        selectSettingsItem(mStringHelper.PRIVACY_SECTION_LABEL, mStringHelper.CLEAR_PRIVATE_DATA_LABEL);
-
-        waitForText("Browsing history"); // Make sure the Clear private data pop-up is displayed
-        Actions.EventExpecter clearPrivateDataEventExpecter = mActions.expectGeckoEvent("Sanitize:Finished");
-        if (mSolo.searchText("Clear data") && !mSolo.searchText("Cookies")) {
-            mSolo.clickOnText("^Clear data$");
-            clearPrivateDataEventExpecter.blockForEvent();
-        } else { // For some reason the pop-up was not opened
-            if (mSolo.searchText("Cookies")) {
-                mSolo.clickOnText("^Clear private data$");
-                waitForText("Browsing history"); // Make sure the Clear private data pop-up is displayed
-                mSolo.clickOnText("^Clear data$");
-                clearPrivateDataEventExpecter.blockForEvent();
-            } else {
-                mAsserter.ok(false, "Something happened and the clear data dialog could not be opened", "Failed to clear data");
-            }
-        }
-
-        // Check that the Master Password isn't disabled by clearing private data
-        waitForText("^Use master password$");
-        mSolo.clickOnText("^Use master password$");
-        mAsserter.ok(mSolo.searchText("^Remove Master Password$"), "Checking if the master password was disabled by clearing private data", "The master password is not disabled by clearing private data");
-        clickOnButton("Cancel"); // Close the Master Password menu
-
-        if ("phone".equals(mDevice.type)) {
-            // Phones don't have headers like tablets, so we need to pop up one more level.
-            waitForText("Use master password");
-            mSolo.goBack();
-        }
-        waitForText(mStringHelper.SETTINGS_LABEL);
-        mSolo.goBack();// Close the Settings Menu
-        // Make sure the settings menu has been closed.
-        mAsserter.ok(mSolo.waitForText("Browser Blank Page 01"), "Waiting for blank browser page after exiting settings", "Blank browser page present");
-    }
-
-    public void verifyLoginPage(String password, String badPassword) {
-        String LOGIN_URL = getAbsoluteUrl(mStringHelper.ROBOCOP_LOGIN_01_URL);
-        String option [] = {"Save", "Don't save"};
-
-        doorhangerDisplayed(LOGIN_URL);// Check that the doorhanger is displayed
-
-        // TODO: Remove this hack -- see bug 915449
-        mSolo.sleep(2000);
-
-        for (String item:option) {
-            if (item.equals("Save")) {
-                final String OK_BUTTON_LABEL = "^OK$";
-                final String SAVE_BUTTON_LABEL = "^Save$";
-                mAsserter.ok(mSolo.waitForText(SAVE_BUTTON_LABEL), "Checking if Save option is present", "Save option is present");
-                mSolo.clickOnButton(SAVE_BUTTON_LABEL);
-
-                // Verify that the Master Password isn't deactivated when the password field is empty
-                closeTabletKeyboard();
-                waitForText(OK_BUTTON_LABEL);
-                mSolo.clickOnButton(OK_BUTTON_LABEL);
-
-                // Verify that the Master Password isn't deactivated when using the wrong password
-                closeTabletKeyboard();
-                editPasswordField(0, badPassword);
-                waitForText(OK_BUTTON_LABEL);
-                mSolo.clickOnButton(OK_BUTTON_LABEL);
-
-                // Verify that the Master Password is deactivated when using the right password
-                closeTabletKeyboard();
-                editPasswordField(0, password);
-                waitForText(OK_BUTTON_LABEL);
-                mSolo.clickOnButton(OK_BUTTON_LABEL);
-
-                // Verify that the Master Password is triggered once per session
-                noDoorhangerDisplayed(LOGIN_URL);// Check that the doorhanger isn't displayed
-            } else {
-                clearPrivateData();
-                doorhangerDisplayed(LOGIN_URL);// Check that the doorhanger is displayed
-                mAsserter.ok(mSolo.waitForText("Don't save"), "Checking if Don't save option is present again", "Don't save option is present again");
-                mSolo.clickOnText("Don't save");
-                doorhangerDisplayed(LOGIN_URL);// Check that the doorhanger is displayed again
-                mAsserter.ok(mSolo.waitForText("Don't save"), "Checking if Don't save option is present again", "Don't save option is present again");
-                mSolo.clickOnText("Don't save");
-                // Make sure the settings menu has been closed.
-                mAsserter.ok(mSolo.waitForText("Browser Blank Page 01"), "Waiting for blank browser page after exiting settings", "Blank browser page present");
-            }
-        }
-    }
-}
deleted file mode 100644
--- a/mobile/android/tests/browser/robocop/src/org/mozilla/gecko/tests/testSettingsMenuItems.java
+++ /dev/null
@@ -1,307 +0,0 @@
-package org.mozilla.gecko.tests;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-
-import org.mozilla.gecko.R;
-import org.mozilla.gecko.Actions;
-import org.mozilla.gecko.AppConstants;
-import org.mozilla.gecko.tabqueue.TabQueueHelper;
-import org.mozilla.gecko.util.HardwareUtils;
-import org.mozilla.gecko.util.InputOptionsUtils;
-
-/** This patch tests the Sections present in the Settings Menu and the
- *  default values for them
- */
-public class testSettingsMenuItems extends PixelTest {
-    // Customize menu items.
-    String[] PATH_CUSTOMIZE;
-    String[][] OPTIONS_CUSTOMIZE;
-
-    // Home panel menu items.
-    String[] PATH_HOME;
-    String[][] OPTIONS_HOME;
-
-    // Display menu items.
-    String[] PATH_DISPLAY;
-    String[] TITLE_BAR_LABEL_ARR;
-    String[][] OPTIONS_DISPLAY;
-
-    // Privacy menu items.
-    String[] PATH_PRIVACY;
-    String[][] OPTIONS_PRIVACY;
-
-    // Mozilla/vendor menu items.
-    String[] PATH_MOZILLA;
-    String[][] OPTIONS_MOZILLA;
-
-    // Developer menu items.
-    String[] PATH_DEVELOPER;
-    String[][] OPTIONS_DEVELOPER;
-
-    /*
-     * This sets up a hierarchy of settings to test.
-     *
-     * The keys are String arrays representing the path through menu items
-     * (the single-item arrays being top-level categories), and each value
-     * is a List of menu items contained within each category.
-     *
-     * Each menu item is itself an array as follows:
-     *  - item title
-     *  - default string value of item (optional)
-     *  - string values of options that are displayed once clicked (optional).
-     */
-    public void setupSettingsMap(Map<String[], List<String[]>> settingsMap) {
-        /**
-         * The following String[][] (arrays) match the menu hierarchy for each section.
-         * Each String[] (array) represents the menu items/choices in the following order:
-         *
-         * itemTitle { defaultValue [options] }
-         *
-         * where defaultValue is optional, and there can be multiple options.
-         *
-         * These menu items are the ones that are always present - to test menu items that differ
-         * based on build (e.g., release vs. nightly), add the items in <code>addConditionalSettings</code>.
-         */
-
-        PATH_CUSTOMIZE = new String[] { mStringHelper.CUSTOMIZE_SECTION_LABEL };
-        OPTIONS_CUSTOMIZE = new String[][] {
-                { mStringHelper.CUSTOMIZE_HOME},
-                { mStringHelper.SEARCH_TITLE, "", mStringHelper.SEARCH_SUGGESTIONS, mStringHelper.SEARCH_INSTALLED},
-                { mStringHelper.TABS_LABEL, mStringHelper.DONT_RESTORE_TABS, mStringHelper.ALWAYS_RESTORE_TABS, mStringHelper.DONT_RESTORE_QUIT },
-                { mStringHelper.IMPORT_FROM_ANDROID_LABEL, "", mStringHelper.BOOKMARKS, mStringHelper.HISTORY, mStringHelper.IMPORT },
-        };
-
-        PATH_HOME = new String[] { mStringHelper.CUSTOMIZE_SECTION_LABEL, mStringHelper.CUSTOMIZE_HOME };
-        OPTIONS_HOME = new String[][] {
-                { mStringHelper.PANELS },
-                { mStringHelper.AUTOMATIC_UPDATES, mStringHelper.ENABLED, mStringHelper.ENABLED, mStringHelper.OVER_WIFI_OPTION},
-        };
-
-        PATH_DISPLAY = new String[] { mStringHelper.DISPLAY_SECTION_LABEL };
-        TITLE_BAR_LABEL_ARR = new String[] { mStringHelper.TITLE_BAR_LABEL, mStringHelper.SHOW_PAGE_ADDRESS_LABEL,
-                mStringHelper.SHOW_PAGE_TITLE_LABEL, mStringHelper.SHOW_PAGE_ADDRESS_LABEL };
-        OPTIONS_DISPLAY = new String[][] {
-                { mStringHelper.TEXT_SIZE_LABEL },
-                TITLE_BAR_LABEL_ARR,
-                { mStringHelper.SCROLL_TITLE_BAR_LABEL, mStringHelper.HIDE_TITLE_BAR },
-                { mStringHelper.ADVANCED},
-                { mStringHelper.CHARACTER_ENCODING_LABEL, mStringHelper.DONT_SHOW_MENU, mStringHelper.SHOW_MENU, mStringHelper.DONT_SHOW_MENU },
-                { mStringHelper.PLUGINS_LABEL, mStringHelper.TAP_TO_PLAY, mStringHelper.ENABLED, mStringHelper.TAP_TO_PLAY, mStringHelper.DISABLED },
-        };
-
-        PATH_PRIVACY = new String[] { mStringHelper.PRIVACY_SECTION_LABEL };
-        OPTIONS_PRIVACY = new String[][] {
-                { mStringHelper.TRACKING_PROTECTION_LABEL },
-                { mStringHelper.DNT_LABEL },
-                { mStringHelper.COOKIES_LABEL, mStringHelper.ENABLED, mStringHelper.ENABLED_EXCLUDE_3RD_PARTY, mStringHelper.ENABLED },
-                { mStringHelper.REMEMBER_LOGINS_LABEL },
-                { mStringHelper.MANAGE_LOGINS_LABEL },
-                { mStringHelper.MASTER_PASSWORD_LABEL },
-                { mStringHelper.CLEAR_PRIVATE_DATA_LABEL, "", mStringHelper.BROWSING_HISTORY,
-                        mStringHelper.SEARCH_HISTORY, mStringHelper.DOWNLOADS, mStringHelper.FORM_HISTORY,
-                        mStringHelper.COOKIES_AND_LOGINS, mStringHelper.CLEAR_PRIVATE_DATA_LABEL, mStringHelper.CACHE,
-                        mStringHelper.OFFLINE_DATA, mStringHelper.SITE_SETTINGS, mStringHelper.CLEAR_DATA_BUTTON },
-        };
-
-        PATH_MOZILLA = new String[] { mStringHelper.MOZILLA_SECTION_LABEL };
-        OPTIONS_MOZILLA = new String[][] {
-                { mStringHelper.ABOUT_LABEL },
-                { mStringHelper.FAQS_LABEL },
-                { mStringHelper.FEEDBACK_LABEL },
-                { mStringHelper.DATA_CHOICES },
-                { mStringHelper.HEALTH_REPORT_LABEL, mStringHelper.HEALTH_REPORT_EXPLANATION },
-                { mStringHelper.MY_HEALTH_REPORT_LABEL },
-        };
-
-        PATH_DEVELOPER = new String[] { mStringHelper.DEVELOPER_TOOLS_SECTION_LABEL };
-        OPTIONS_DEVELOPER = new String[][] {
-                { mStringHelper.REMOTE_DEBUGGING_USB_LABEL },
-                { mStringHelper.LEARN_MORE_LABEL },
-                { mStringHelper.REMOTE_DEBUGGING_WIFI_LABEL },
-                { mStringHelper.LEARN_MORE_LABEL },
-        };
-
-        settingsMap.put(PATH_CUSTOMIZE, new ArrayList<String[]>(Arrays.asList(OPTIONS_CUSTOMIZE)));
-        settingsMap.put(PATH_HOME, new ArrayList<String[]>(Arrays.asList(OPTIONS_HOME)));
-        settingsMap.put(PATH_DISPLAY, new ArrayList<String[]>(Arrays.asList(OPTIONS_DISPLAY)));
-        settingsMap.put(PATH_PRIVACY, new ArrayList<String[]>(Arrays.asList(OPTIONS_PRIVACY)));
-        settingsMap.put(PATH_MOZILLA, new ArrayList<String[]>(Arrays.asList(OPTIONS_MOZILLA)));
-        settingsMap.put(PATH_DEVELOPER, new ArrayList<String[]>(Arrays.asList(OPTIONS_DEVELOPER)));
-    }
-
-    public void testSettingsMenuItems() {
-        blockForGeckoReady();
-
-        Map<String[], List<String[]>> settingsMenuItems = new HashMap<String[], List<String[]>>();
-        setupSettingsMap(settingsMenuItems);
-
-        // Set special handling for Settings items that are conditionally built.
-        updateConditionalSettings(settingsMenuItems);
-
-        selectMenuItem(mStringHelper.SETTINGS_LABEL);
-        mAsserter.ok(mSolo.waitForText(mStringHelper.SETTINGS_LABEL),
-                "The Settings menu did not load", mStringHelper.SETTINGS_LABEL);
-
-        // Dismiss the Settings screen and verify that the view is returned to about:home page
-        mSolo.goBack();
-
-        // Waiting for page title to appear to be sure that is fully loaded before opening the menu
-        mAsserter.ok(mSolo.waitForText(mStringHelper.TITLE_PLACE_HOLDER), "about:home did not load",
-                mStringHelper.TITLE_PLACE_HOLDER);
-
-        selectMenuItem(mStringHelper.SETTINGS_LABEL);
-        mAsserter.ok(mSolo.waitForText(mStringHelper.SETTINGS_LABEL),
-                "The Settings menu did not load", mStringHelper.SETTINGS_LABEL);
-
-        checkForSync(mDevice);
-
-        checkMenuHierarchy(settingsMenuItems);
-    }
-
-    /**
-     * Check for Sync in settings.
-     *
-     * Sync location is a top level menu item on phones and small tablets,
-     * but is under "Customize" on large tablets.
-     */
-    public void checkForSync(Device device) {
-        mAsserter.ok(mSolo.waitForText(mStringHelper.SYNC_LABEL), "Waiting for Sync option",
-                mStringHelper.SYNC_LABEL);
-    }
-
-    /**
-     * Check for conditions for building certain settings, and add them to be tested
-     * if they are present.
-     */
-    public void updateConditionalSettings(Map<String[], List<String[]>> settingsMap) {
-        // Preferences dependent on RELEASE_BUILD
-        if (!AppConstants.RELEASE_BUILD) {
-            if (AppConstants.MOZ_STUMBLER_BUILD_TIME_ENABLED) {
-                // Anonymous cell tower/wifi collection
-                String[] networkReportingUi = { mStringHelper.MOZ_LOCATION, mStringHelper.MOZ_LOCATION_MSG };
-                settingsMap.get(PATH_MOZILLA).add(networkReportingUi);
-
-                String[] learnMoreUi = { mStringHelper.LEARN_MORE };
-                settingsMap.get(PATH_MOZILLA).add(learnMoreUi);
-            }
-        }
-
-        // Automatic updates
-        if (AppConstants.MOZ_UPDATER) {
-            String[] autoUpdateUi = { mStringHelper.DOWNLOAD_UPDATES_AUTO, mStringHelper.OVER_WIFI_OPTION, mStringHelper.ALWAYS, mStringHelper.OVER_WIFI_OPTION, mStringHelper.NEVER };
-            settingsMap.get(PATH_CUSTOMIZE).add(autoUpdateUi);
-        }
-
-        // Tab Queue
-        if (TabQueueHelper.TAB_QUEUE_ENABLED) {
-            final String[] tabQueue = { mStringHelper.TAB_QUEUE_LABEL, mStringHelper.TAB_QUEUE_SUMMARY };
-            settingsMap.get(PATH_CUSTOMIZE).add(tabQueue);
-        }
-
-        // Crash reporter
-        if (AppConstants.MOZ_CRASHREPORTER) {
-            String[] crashReporterUi = { mStringHelper.CRASH_REPORTER, mStringHelper.CRASH_REPORTER_MSG};
-            settingsMap.get(PATH_MOZILLA).add(crashReporterUi);
-        }
-
-        // Telemetry
-        if (AppConstants.MOZ_TELEMETRY_REPORTING) {
-            String[] telemetryUi = { mStringHelper.TELEMETRY, mStringHelper.TELEMETRY_MSG};
-            settingsMap.get(PATH_MOZILLA).add(telemetryUi);
-        }
-
-        // Tablet: we don't allow a page title option.
-        if (HardwareUtils.isTablet()) {
-            settingsMap.get(PATH_DISPLAY).remove(TITLE_BAR_LABEL_ARR);
-        }
-
-        // Voice input
-        if (InputOptionsUtils.supportsVoiceRecognizer(this.getActivity().getApplicationContext(), this.getActivity().getResources().getString(R.string.voicesearch_prompt))) {
-            String[] voiceInputUi = { mStringHelper.VOICE_INPUT_TITLE_LABEL, mStringHelper.VOICE_INPUT_SUMMARY_LABEL };
-            settingsMap.get(PATH_DISPLAY).add(voiceInputUi);
-        }
-
-        // QR Code input
-        if (InputOptionsUtils.supportsQrCodeReader(this.getActivity().getApplicationContext())) {
-            String[] qrCodeInputUi = { mStringHelper.QRCODE_INPUT_TITLE_LABEL, mStringHelper.QRCODE_INPUT_SUMMARY_LABEL };
-            settingsMap.get(PATH_DISPLAY).add(qrCodeInputUi);
-        }
-    }
-
-    public void checkMenuHierarchy(Map<String[], List<String[]>> settingsMap) {
-        // Check the items within each category.
-        String section = null;
-        for (Entry<String[], List<String[]>> e : settingsMap.entrySet()) {
-            final String[] menuPath = e.getKey();
-
-            for (String menuItem : menuPath) {
-                section = "^" + menuItem + "$";
-
-                waitForEnabledText(section);
-                mSolo.clickOnText(section);
-            }
-
-            List<String[]> sectionItems = e.getValue();
-
-            // Check each item of the section.
-            for (String[] item : sectionItems) {
-                int itemLen = item.length;
-
-                // Each item must at least have a title.
-                mAsserter.ok(item.length > 0, "Section-item", "Each item must at least have a title");
-
-                // Check item title.
-                String itemTitle = "^" + item[0] + "$";
-                boolean foundText = waitForPreferencesText(itemTitle);
-
-                mAsserter.ok(foundText, "Waiting for settings item " + itemTitle + " in section " + section,
-                             "The " + itemTitle + " option is present in section " + section);
-                // Check item default, if it exists.
-                if (itemLen > 1) {
-                    String itemDefault = "^" + item[1] + "$";
-                    foundText = waitForPreferencesText(itemDefault);
-                    mAsserter.ok(foundText, "Waiting for settings item default " + itemDefault
-                                 + " in section " + section,
-                                 "The " + itemDefault + " default is present in section " + section);
-                }
-                // Check item choices, if they exist.
-                if (itemLen > 2) {
-                    waitForEnabledText(itemTitle);
-                    mSolo.clickOnText(itemTitle);
-                    for (int i = 2; i < itemLen; i++) {
-                        String itemChoice = "^" + item[i] + "$";
-                        foundText = waitForPreferencesText(itemChoice);
-                        mAsserter.ok(foundText, "Waiting for settings item choice " + itemChoice
-                                     + " in section " + section,
-                                     "The " + itemChoice + " choice is present in section " + section);
-                    }
-
-                    // Leave submenu after checking.
-                    if (waitForText("^Cancel$")) {
-                        mSolo.clickOnText("^Cancel$");
-                    } else {
-                        // Some submenus aren't dialogs, but are nested screens; exit using "back".
-                        mSolo.goBack();
-                    }
-                }
-            }
-
-            // Navigate back if on a phone or small tablets. Large tablets
-            // shouldn't do this because they use headers and fragments.
-            if (mDevice.type.equals("phone") || HardwareUtils.isSmallTablet()) {
-                int menuDepth = menuPath.length;
-                while (menuDepth > 0) {
-                    mSolo.goBack();
-                    menuDepth--;
-                    // Sleep so subsequent back actions aren't lost.
-                    mSolo.sleep(150);
-                }
-            }
-        }
-    }
-}
deleted file mode 100644
--- a/mobile/android/tests/browser/robocop/src/org/mozilla/gecko/tests/testSystemPages.java
+++ /dev/null
@@ -1,94 +0,0 @@
-package org.mozilla.gecko.tests;
-
-import org.mozilla.gecko.Actions;
-import org.mozilla.gecko.AppConstants;
-
-/** This patch tests the System Pages first by loading system pages from
- *  the awesome bar and then from Firefox menu
- */
-public class testSystemPages extends PixelTest {
-    final int mExpectedTabCount = 1;
-    private static final int AFTER_BACK_SLEEP_MS = 500;
-
-    public void testSystemPages() {
-        blockForGeckoReady();
-
-        final String urls [] = { mStringHelper.ABOUT_FIREFOX_URL, mStringHelper.ABOUT_RIGHTS_URL,
-                mStringHelper.ABOUT_ADDONS_URL, mStringHelper.ABOUT_DOWNLOADS_URL, StringHelper.ABOUT_LOGINS_URL,
-                mStringHelper.ABOUT_BUILDCONFIG_URL, mStringHelper.ABOUT_FEEDBACK_URL,
-                mStringHelper.ABOUT_HEALTHREPORT_URL, mStringHelper.ABOUT_SCHEME
-        };
-        // Pages to be tested from the menu and their expected urls. This if of the form { {{ <path to item> }, { <expected url> }}* }
-        String menuItems [][][] = {{{ mStringHelper.DOWNLOADS_LABEL }, { mStringHelper.ABOUT_DOWNLOADS_URL}},
-                                  {{ mStringHelper.LOGINS_LABEL}, { StringHelper.ABOUT_LOGINS_URL }},
-                                  {{ mStringHelper.ADDONS_LABEL }, { mStringHelper.ABOUT_ADDONS_URL }},
-                                  {{ mStringHelper.SETTINGS_LABEL, mStringHelper.MOZILLA_SECTION_LABEL, mStringHelper.ABOUT_LABEL }, { mStringHelper.ABOUT_SCHEME }},
-                                  {{ mStringHelper.SETTINGS_LABEL, mStringHelper.MOZILLA_SECTION_LABEL, mStringHelper.FEEDBACK_LABEL }, { mStringHelper.ABOUT_FEEDBACK_URL }},
-                                  {{ mStringHelper.SETTINGS_LABEL, mStringHelper.MOZILLA_SECTION_LABEL, mStringHelper.MY_HEALTH_REPORT_LABEL }, { mStringHelper.ABOUT_HEALTHREPORT_URL }}};
-
-        /* Load system pages from url and check that the pages are loaded in the same tab */
-        checkUrl(urls);
-
-        /* Verify that the search field is not in the focus by pressing back. That will load the previous
-           about: page if there is no the keyboard to dismiss, meaning that the search field was not in focus */
-        loadAndPaint(mStringHelper.ABOUT_ABOUT_URL);
-
-        // Press back to verify if the keyboard is dismissed or the previous about: page loads
-        mSolo.goBack();
-        // may not get a paint on Back...pause briefly to make sure it completes
-        mSolo.sleep(AFTER_BACK_SLEEP_MS);
-
-        // We will use the "about:" page as our reference page.
-        loadAndPaint(mStringHelper.ABOUT_SCHEME);
-        verifyUrl(mStringHelper.ABOUT_SCHEME); // Verify that the previous about: page is loaded, meaning no keyboard was present
-
-        // Load system pages by navigating through the UI.
-        loadItemsByLevel(menuItems);
-    }
-
-    // Load from Url the about: pages,verify the Url and the tabs number
-    public void checkUrl(String urls []) {
-        for (String url:urls) {
-            loadAndPaint(url);
-            verifyTabCount(mExpectedTabCount);
-            verifyUrl(url);
-        }
-    }
-
-    public void loadItemsByLevel(String[][][] menuItems) {
-        Actions.EventExpecter tabEventExpecter;
-        Actions.EventExpecter contentEventExpecter;
-        Actions.RepeatedEventExpecter paintExpecter = mActions.expectPaint();
-        int expectedTabCount = mExpectedTabCount;
-        // There's some special casing for about: because it's our starting page.
-        for (String[][] item : menuItems) {
-            String [] pathToItem = item[0];
-            String expectedUrl = item[1][0];
-
-            expectedTabCount++;
-
-            // Set up listeners to catch the page load we're about to do
-            tabEventExpecter = mActions.expectGeckoEvent("Tab:Added");
-            contentEventExpecter = mActions.expectGeckoEvent("DOMContentLoaded");
-            selectMenuItemByPath(pathToItem);
-
-            // Wait for the new tab and page to load
-            if (mStringHelper.ABOUT_SCHEME.equals(expectedUrl)) {
-                waitForPaint(paintExpecter); // Waiting for the page to load
-                paintExpecter.unregisterListener();
-            } else {
-                tabEventExpecter.blockForEvent();
-                contentEventExpecter.blockForEvent();
-            }
-            tabEventExpecter.unregisterListener();
-            contentEventExpecter.unregisterListener();
-
-            verifyUrl(expectedUrl);
-            if (mStringHelper.ABOUT_SCHEME.equals(expectedUrl)) {
-                // Decreasing because we do not expect this to be in a different tab.
-                expectedTabCount--;
-            }
-            verifyTabCount(expectedTabCount);
-        }
-    }
-}
deleted file mode 100644
--- a/mobile/android/tests/browser/robocop/src/org/mozilla/gecko/tests/testTitleBar.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package org.mozilla.gecko.tests;
-
-import org.mozilla.gecko.util.HardwareUtils;
-
-/**
- * This patch tests the option that shows the full URL and title in the URL Bar
- */
-
-public class testTitleBar extends PixelTest {
-    public void testTitleBar() {
-        // Because there is no title bar option on new tablet, we don't need to run this test.
-        if (HardwareUtils.isTablet()) {
-            return;
-        }
-
-        blockForGeckoReady();
-        checkOption();
-    }
-
-    public void checkOption() {
-
-        String blank1 = getAbsoluteUrl(mStringHelper.ROBOCOP_BLANK_PAGE_01_URL);
-        String title = mStringHelper.ROBOCOP_BLANK_PAGE_01_TITLE;
-
-        // Loading a page
-        loadUrlAndWait(blank1);
-        verifyUrlBarTitle(blank1);
-
-        // Ensure the title is displayed in the URL Bar
-        selectOption(mStringHelper.SHOW_PAGE_TITLE_LABEL);
-        loadUrlAndWait(blank1);
-        verifyUrlBarTitle(title);
-
-        // Ensure the full URL is displayed in the URL Bar
-        selectOption(mStringHelper.SHOW_PAGE_ADDRESS_LABEL);
-        loadUrlAndWait(blank1);
-        verifyUrlBarTitle(blank1);
-    }
-
-    // Entering settings, changing the options: show title/page address option and verifing the device type because for phone there is an extra back action to exit the settings menu
-    public void selectOption(String option) {
-        selectSettingsItem(mStringHelper.DISPLAY_SECTION_LABEL, mStringHelper.TITLE_BAR_LABEL);
-        mAsserter.ok(waitForText(mStringHelper.SHOW_PAGE_TITLE_LABEL), "Waiting for the pop-up to open", "Pop up with the options was openend");
-        mSolo.clickOnText(option);
-        mAsserter.ok(waitForText(mStringHelper.CHARACTER_ENCODING_LABEL), "Waiting to press the option", "The pop-up is dismissed once clicked");
-        if (mDevice.type.equals("phone")) {
-            mSolo.goBack();
-            mAsserter.ok(waitForText(mStringHelper.CUSTOMIZE_SECTION_LABEL), "Waiting to perform one back", "One back performed");
-            mSolo.goBack();
-            mAsserter.ok(waitForText(mStringHelper.ROBOCOP_BLANK_PAGE_01_URL), "Waiting to exit settings", "Exit settings done");
-        }
-        else {
-            mSolo.goBack();
-            mAsserter.ok(waitForText(mStringHelper.ROBOCOP_BLANK_PAGE_01_URL), "Waiting to exit settings", "Exit settings done");
-        }
-    }
-}