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

chrome/browser/android/preferences/pref_service_bridge.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/android/preferences/pref_service_bridge.h"
 
 #include <jni.h>
 #include <stddef.h>
 #include <vector>
 
@@ skipping 42 matching lines @@
 using base::android::AttachCurrentThread;
 using base::android::CheckException;
 using base::android::ConvertJavaStringToUTF8;
 using base::android::ConvertUTF8ToJavaString;
 using base::android::ScopedJavaLocalRef;
 using base::android::ScopedJavaGlobalRef;
 using content::BrowserThread;
 
 namespace {
 
-enum NetworkPredictionOptions {
-  NETWORK_PREDICTION_ALWAYS,
-  NETWORK_PREDICTION_WIFI_ONLY,
-  NETWORK_PREDICTION_NEVER,
-};
-
 Profile* GetOriginalProfile() {
   return ProfileManager::GetActiveUserProfile()->GetOriginalProfile();
 }
 
 bool GetBooleanForContentSetting(ContentSettingsType type) {
   HostContentSettingsMap* content_settings =
       HostContentSettingsMapFactory::GetForProfile(GetOriginalProfile());
   switch (content_settings->GetDefaultContentSetting(type, NULL)) {
     case CONTENT_SETTING_BLOCK:
       return false;
@@ skipping 164 matching lines @@
     const JavaParamRef<jobject>& obj) {
   return GetPrefService()->IsManagedPreference(
       password_manager::prefs::kCredentialsEnableAutosignin);
 }
 
 static jboolean GetDoNotTrackEnabled(JNIEnv* env,
                                      const JavaParamRef<jobject>& obj) {
   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,
                                             const JavaParamRef<jobject>& obj) {
   return GetPrefService()->IsManagedPreference(
       prefs::kNetworkPredictionOptions);
 }
 
 static jboolean GetPasswordEchoEnabled(JNIEnv* env,
                                        const JavaParamRef<jobject>& obj) {
@@ skipping 429 matching lines @@
       allow ? CONTENT_SETTING_ASK : CONTENT_SETTING_BLOCK);
 }
 
 static void SetCrashReporting(JNIEnv* env,
                               const JavaParamRef<jobject>& obj,
                               jboolean reporting) {
   PrefService* local_state = g_browser_process->local_state();
   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;
 }
 
 static void SetDoNotTrackEnabled(JNIEnv* env,
                                  const JavaParamRef<jobject>& obj,
                                  jboolean allow) {
   GetPrefService()->SetBoolean(prefs::kEnableDoNotTrack, allow);
 }
@@ skipping 136 matching lines @@
   return GetPrefService()->IsManagedPreference(prefs::kContextualSearchEnabled);
 }
 
 static void SetContextualSearchPreference(JNIEnv* env,
                                           const JavaParamRef<jobject>& obj,
                                           const JavaParamRef<jstring>& pref) {
   GetPrefService()->SetString(prefs::kContextualSearchEnabled,
       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_WIFI_ONLY
+              : 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 =
       GetPrefService()->GetUserPrefValue(prefs::kNetworkPredictionEnabled);
   DCHECK(network_prediction_enabled);
   bool value = false;
   DCHECK(network_prediction_enabled->GetAsBoolean(&value));
   return value;
 }
 
@@ skipping 142 matching lines @@
 
   return ConvertJavaStringToUTF8(android_permission);
 }
 
 static void SetSupervisedUserId(JNIEnv* env,
                                 const JavaParamRef<jobject>& obj,
                                 const JavaParamRef<jstring>& pref) {
   GetPrefService()->SetString(prefs::kSupervisedUserId,
                               ConvertJavaStringToUTF8(env, pref));
 }