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

chrome/browser/android/preferences/pref_service_bridge.cc

Index: chrome/browser/android/preferences/pref_service_bridge.cc
diff --git a/chrome/browser/android/preferences/pref_service_bridge.cc b/chrome/browser/android/preferences/pref_service_bridge.cc
index 18dcba128dcdc5460161913b2446a6affea7d457..d6a6ac7fda26df0b713d1f0e00c2b279bb256878 100644
--- a/chrome/browser/android/preferences/pref_service_bridge.cc
+++ b/chrome/browser/android/preferences/pref_service_bridge.cc
@@ -60,12 +60,6 @@ using content::BrowserThread;
 
 namespace {
 
-enum NetworkPredictionOptions {
-  NETWORK_PREDICTION_ALWAYS,
-  NETWORK_PREDICTION_WIFI_ONLY,
-  NETWORK_PREDICTION_NEVER,
-};
-
 Profile* GetOriginalProfile() {
   return ProfileManager::GetActiveUserProfile()->GetOriginalProfile();
 }
@@ -250,9 +244,10 @@ static jboolean GetDoNotTrackEnabled(JNIEnv* env,
   return GetPrefService()->GetBoolean(prefs::kEnableDoNotTrack);
 }
 
-static jint GetNetworkPredictionOptions(JNIEnv* env,
+static jboolean GetNetworkPredictionEnabled(JNIEnv* env,
                                         const JavaParamRef<jobject>& obj) {
-  return GetPrefService()->GetInteger(prefs::kNetworkPredictionOptions);
+  return GetPrefService()->GetInteger(prefs::kNetworkPredictionOptions)
+      != chrome_browser_net::NETWORK_PREDICTION_NEVER;
 }
 
 static jboolean GetNetworkPredictionManaged(JNIEnv* env,
@@ -687,7 +682,7 @@ static void SetCrashReporting(JNIEnv* env,
   local_state->SetBoolean(prefs::kCrashReportingEnabled, reporting);
 }
 
-static jboolean CanPredictNetworkActions(JNIEnv* env,
+static jboolean CanPrefetchAndPrerender(JNIEnv* env,
                                          const JavaParamRef<jobject>& obj) {
   return chrome_browser_net::CanPrefetchAndPrerenderUI(GetPrefService()) ==
       chrome_browser_net::NetworkPredictionStatus::ENABLED;
@@ -844,27 +839,30 @@ static void SetContextualSearchPreference(JNIEnv* env,
       ConvertJavaStringToUTF8(env, pref));
 }
 
-static void SetNetworkPredictionOptions(JNIEnv* env,
+static void SetNetworkPredictionEnabled(JNIEnv* env,
                                         const JavaParamRef<jobject>& obj,
-                                        int option) {
-  GetPrefService()->SetInteger(prefs::kNetworkPredictionOptions, option);
+                                        jboolean enabled) {
+  GetPrefService()->SetInteger(
+      prefs::kNetworkPredictionOptions,
+      enabled ? chrome_browser_net::NETWORK_PREDICTION_ALWAYS
+              : chrome_browser_net::NETWORK_PREDICTION_NEVER);
 }
 
-static jboolean NetworkPredictionEnabledHasUserSetting(
+static jboolean ObsoleteNetworkPredictionEnabledHasUserSetting(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj) {
   return GetPrefService()->GetUserPrefValue(
       prefs::kNetworkPredictionEnabled) != NULL;
 }
 
-static jboolean NetworkPredictionOptionsHasUserSetting(
+static jboolean ObsoleteNetworkPredictionOptionsHasUserSetting(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj) {
   return GetPrefService()->GetUserPrefValue(
       prefs::kNetworkPredictionOptions) != NULL;
 }
 
-static jboolean GetNetworkPredictionEnabledUserPrefValue(
+static jboolean ObsoleteGetNetworkPredictionEnabledUserPrefValue(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj) {
   const base::Value* network_prediction_enabled =