[Android] Simplify "network predictions" preference to a boolean value.

chrome/test/android/javatests/src/org/chromium/chrome/test/ChromeActivityTestCaseBase.java

Index: chrome/test/android/javatests/src/org/chromium/chrome/test/ChromeActivityTestCaseBase.java
diff --git a/chrome/test/android/javatests/src/org/chromium/chrome/test/ChromeActivityTestCaseBase.java b/chrome/test/android/javatests/src/org/chromium/chrome/test/ChromeActivityTestCaseBase.java
index 139aad8190396a7604b6539604774d90c719fbd5..ffc5f2adcf1a065b89a7fda32434a1e36620a811 100644
--- a/chrome/test/android/javatests/src/org/chromium/chrome/test/ChromeActivityTestCaseBase.java
+++ b/chrome/test/android/javatests/src/org/chromium/chrome/test/ChromeActivityTestCaseBase.java
@@ -42,7 +42,6 @@ import org.chromium.chrome.browser.omnibox.LocationBarLayout;
 import org.chromium.chrome.browser.omnibox.OmniboxResultsAdapter.OmniboxResultItem;
 import org.chromium.chrome.browser.omnibox.OmniboxSuggestion;
 import org.chromium.chrome.browser.omnibox.UrlBar;
-import org.chromium.chrome.browser.preferences.NetworkPredictionOptions;
 import org.chromium.chrome.browser.preferences.PrefServiceBridge;
 import org.chromium.chrome.browser.preferences.Preferences;
 import org.chromium.chrome.browser.preferences.PreferencesLauncher;
@@ -103,8 +102,6 @@ public abstract class ChromeActivityTestCaseBase<T extends ChromeActivity>
     // The number of ms to wait for the rendering activity to be started.
     protected static final int ACTIVITY_START_TIMEOUT_MS = 1000;
 
-    private static final String PERF_NORUN_TAG = "--NORUN--";
-
     private static final String PERF_ANNOTATION_FORMAT = "**PERFANNOTATION(%s):";
 
     private static final String MEMORY_TRACE_GRAPH_SUFFIX = " - browser PSS";
@@ -213,13 +210,11 @@ public abstract class ChromeActivityTestCaseBase<T extends ChromeActivity>
      *
      * @param enabled whether prerender should be on.
      */
-    protected void setAllowPrerender(final boolean enabled) {
+    protected void setNetworkPredictionEnabled(final boolean enabled) {
         getInstrumentation().runOnMainSync(new Runnable() {
             @Override
             public void run() {
-                PrefServiceBridge.getInstance().setNetworkPredictionOptions(enabled
-                        ? NetworkPredictionOptions.NETWORK_PREDICTION_ALWAYS
-                        : NetworkPredictionOptions.NETWORK_PREDICTION_NEVER);
+                PrefServiceBridge.getInstance().setNetworkPredictionEnabled(enabled);
             }
         });
     }
@@ -329,7 +324,7 @@ public abstract class ChromeActivityTestCaseBase<T extends ChromeActivity>
     /**
      * @param url            The url of the page to load.
      * @param pageTransition The type of transition. see
-     *                       {@link org.chromium.content.browser.PageTransition}
+     *                       {@link org.chromium.ui.base.PageTransition}
      *                       for valid values.
      * @param tab            The tab to load the url into.
      * @param secondsToWait  The number of seconds to wait for the page to be loaded.
@@ -360,7 +355,7 @@ public abstract class ChromeActivityTestCaseBase<T extends ChromeActivity>
     /**
      * @param url            The url of the page to load.
      * @param pageTransition The type of transition. see
-     *                       {@link org.chromium.content.browser.PageTransition}
+     *                       {@link org.chromium.ui.base.PageTransition}
      *                       for valid values.
      * @param tab            The tab to load the url into.
      * @return               FULL_PRERENDERED_PAGE_LOAD or PARTIAL_PRERENDERED_PAGE_LOAD if the