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

chrome/android/javatests/src/org/chromium/chrome/browser/infobar/InfoBarContainerTest.java

Index: chrome/android/javatests/src/org/chromium/chrome/browser/infobar/InfoBarContainerTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/infobar/InfoBarContainerTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/infobar/InfoBarContainerTest.java
index e1745da693c76babcd85731b87e5afadf1ed3906..2623f8fc279f47157bc56217b1d299212510de80 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/infobar/InfoBarContainerTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/infobar/InfoBarContainerTest.java
@@ -16,7 +16,6 @@ import org.chromium.base.ThreadUtils;
 import org.chromium.base.test.util.Feature;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ChromeActivity;
-import org.chromium.chrome.browser.preferences.NetworkPredictionOptions;
 import org.chromium.chrome.browser.preferences.PrefServiceBridge;
 import org.chromium.chrome.test.ChromeActivityTestCaseBase;
 import org.chromium.chrome.test.util.InfoBarTestAnimationListener;
@@ -162,13 +161,12 @@ public class InfoBarContainerTest extends ChromeActivityTestCaseBase<ChromeActiv
     }
 
     // Define function to pass parameter to Runnable to be used in testInfoBarExpirationNoPrerender.
-    private Runnable setNetworkPredictionOptions(
-            final NetworkPredictionOptions networkPredictionOptions) {
+    private Runnable setNetworkPredictionOptions(final boolean networkPredictionEnabled) {
         return new Runnable() {
             @Override
             public void run() {
-                PrefServiceBridge.getInstance().setNetworkPredictionOptions(
-                        networkPredictionOptions);
+                PrefServiceBridge.getInstance().setNetworkPredictionEnabled(
+                        networkPredictionEnabled);
             }
         };
     }
@@ -177,26 +175,25 @@ public class InfoBarContainerTest extends ChromeActivityTestCaseBase<ChromeActiv
      * Same as testInfoBarExpiration but with prerender turned-off.
      * The behavior when prerender is on/off is different as in the prerender case the infobars are
      * added when we swap tabs.
-     * @throws InterruptedException
      */
     @MediumTest
     @Feature({"Browser"})
     public void testInfoBarExpirationNoPrerender() throws Exception {
         // Save prediction preference.
-        NetworkPredictionOptions networkPredictionOption =
-                ThreadUtils.runOnUiThreadBlocking(new Callable<NetworkPredictionOptions>() {
+        boolean networkPredictionEnabled =
+                ThreadUtils.runOnUiThreadBlocking(new Callable<Boolean>() {
                     @Override
-                    public NetworkPredictionOptions call() {
-                        return PrefServiceBridge.getInstance().getNetworkPredictionOptions();
+                    public Boolean call() {
+                        return PrefServiceBridge.getInstance().getNetworkPredictionEnabled();
                     }
                 });
         try {
-            ThreadUtils.runOnUiThreadBlocking(setNetworkPredictionOptions(
-                    NetworkPredictionOptions.NETWORK_PREDICTION_NEVER));
+            ThreadUtils.runOnUiThreadBlocking(setNetworkPredictionOptions(false));
             testInfoBarExpiration();
         } finally {
             // Make sure we restore prediction preference.
-            ThreadUtils.runOnUiThreadBlocking(setNetworkPredictionOptions(networkPredictionOption));
+            ThreadUtils.runOnUiThreadBlocking(
+                    setNetworkPredictionOptions(networkPredictionEnabled));
         }
     }