Remove PrefServiceBridge code duplication in PersonalDataManager

Change-Id: Ib700829caf0a1e200a7fd8358e8f8f332a7393cb
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1918652
Commit-Queue: sebsg <sebsg@chromium.org>
Reviewed-by: sebsg <sebsg@chromium.org>
Cr-Commit-Position: refs/heads/master@{#715686}

chrome/android/java/src/org/chromium/chrome/browser/autofill/PersonalDataManager.java

@@ -17,6 +17,7 @@ import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ResourceId;
 import org.chromium.chrome.browser.preferences.MainPreferences;
 import org.chromium.chrome.browser.preferences.Pref;
+import org.chromium.chrome.browser.preferences.PrefServiceBridge;
 import org.chromium.content_public.browser.WebContents;
 
 import java.util.ArrayList;
@@ -962,14 +963,14 @@ public class PersonalDataManager {
      * @return Whether the Autofill feature for Profiles (addresses) is enabled.
      */
     public static boolean isAutofillProfileEnabled() {
-        return PersonalDataManagerJni.get().getPref(Pref.AUTOFILL_PROFILE_ENABLED);
+        return PrefServiceBridge.getInstance().getBoolean(Pref.AUTOFILL_PROFILE_ENABLED);
     }
 
     /**
      * @return Whether the Autofill feature for Credit Cards is enabled.
      */
     public static boolean isAutofillCreditCardEnabled() {
-        return PersonalDataManagerJni.get().getPref(Pref.AUTOFILL_CREDIT_CARD_ENABLED);
+        return PrefServiceBridge.getInstance().getBoolean(Pref.AUTOFILL_CREDIT_CARD_ENABLED);
     }
 
     /**
@@ -977,7 +978,7 @@ public class PersonalDataManager {
      * @param enable True to disable profile Autofill, false otherwise.
      */
     public static void setAutofillProfileEnabled(boolean enable) {
-        PersonalDataManagerJni.get().setPref(Pref.AUTOFILL_PROFILE_ENABLED, enable);
+        PrefServiceBridge.getInstance().setBoolean(Pref.AUTOFILL_PROFILE_ENABLED, enable);
     }
 
     /**
@@ -985,7 +986,7 @@ public class PersonalDataManager {
      * @param enable True to disable credit card Autofill, false otherwise.
      */
     public static void setAutofillCreditCardEnabled(boolean enable) {
-        PersonalDataManagerJni.get().setPref(Pref.AUTOFILL_CREDIT_CARD_ENABLED, enable);
+        PrefServiceBridge.getInstance().setBoolean(Pref.AUTOFILL_CREDIT_CARD_ENABLED, enable);
     }
 
     /**
@@ -1129,7 +1130,5 @@ public class PersonalDataManager {
         String toCountryCode(String countryName);
         void cancelPendingGetSubKeys(long nativePersonalDataManagerAndroid);
         void setSyncServiceForTesting(long nativePersonalDataManagerAndroid);
-        boolean getPref(int preference);
-        void setPref(int preference, boolean enable);
     }
 }

chrome/browser/autofill/android/personal_data_manager_android.cc

@@ -18,7 +18,6 @@
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "chrome/android/chrome_jni_headers/PersonalDataManager_jni.h"
-#include "chrome/browser/android/preferences/prefs.h"
 #include "chrome/browser/android/resource_mapper.h"
 #include "chrome/browser/autofill/address_normalizer_factory.h"
 #include "chrome/browser/autofill/personal_data_manager_factory.h"
@@ -862,23 +861,6 @@ PersonalDataManagerAndroid::GetShippingAddressLabelForPaymentRequest(
                g_browser_process->GetApplicationLocale()));
 }
 
-// Returns whether the specified feature is enabled.
-static jboolean JNI_PersonalDataManager_GetPref(
-    JNIEnv* env,
-    const jint j_pref_index) {
-  return GetPrefs()->GetBoolean(
-      PersonalDataManagerAndroid::GetPrefNameExposedToJava(j_pref_index));
-}
-
-// Enables or disables the specified feature for profiles.
-static void JNI_PersonalDataManager_SetPref(JNIEnv* env,
-                                            const jint j_pref_index,
-                                            const jboolean j_enable) {
-  return GetPrefs()->SetBoolean(
-      PersonalDataManagerAndroid::GetPrefNameExposedToJava(j_pref_index),
-      j_enable);
-}
-
 // Returns whether the Autofill feature is managed.
 static jboolean JNI_PersonalDataManager_IsAutofillManaged(JNIEnv* env) {
   return prefs::IsAutofillManaged(GetPrefs());
@@ -925,11 +907,4 @@ static jlong JNI_PersonalDataManager_Init(JNIEnv* env,
   return reinterpret_cast<intptr_t>(personal_data_manager_android);
 }
 
-const char* PersonalDataManagerAndroid::GetPrefNameExposedToJava(
-    int pref_index) {
-  DCHECK_GE(pref_index, 0);
-  DCHECK_LT(pref_index, Pref::PREF_NUM_PREFS);
-  return kPrefsExposedToJava[pref_index];
-}
-
 }  // namespace autofill

chrome/browser/autofill/android/personal_data_manager_android.h

@@ -340,8 +340,6 @@ class PersonalDataManagerAndroid : public PersonalDataManagerObserver {
 
   void SetSyncServiceForTesting(JNIEnv* env);
 
-  static const char* GetPrefNameExposedToJava(int pref_index);
-
  private:
   ~PersonalDataManagerAndroid() override;