From 3ffd0ad211ff6c5eb3d11ec9ea2547b91bee4ae7 Mon Sep 17 00:00:00 2001
From: Max Karolinskiy <max@brave.com>
Date: Tue, 14 Jan 2020 13:08:53 -0500
Subject: [PATCH] [Android] Use SEARCH_SUGGEST_ENABLED with PrefServiceBridge.

Chromium change:

https://chromium.googlesource.com/chromium/src/+/97fd6bcffbe752b404b4664f2314f6045095ba69

commit 97fd6bcffbe752b404b4664f2314f6045095ba69
Author: Natalie Chouinard <chouinard@chromium.org>
Date:   Wed Oct 23 21:28:19 2019 +0000

    Add isManagedPreference to PrefServiceBridge

    Add a generic isManagedPreference method to PrefServiceBridge, making
    use of the prefs.h enums.

    Migrate Java usages of prefs::kSearchSuggestEnabled to use the generic
    methods as a sample (more to follow).

    Bug: 1016957
---
 .../browser/settings/privacy/BravePrivacyPreferences.java  | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/android/java/org/chromium/chrome/browser/settings/privacy/BravePrivacyPreferences.java b/android/java/org/chromium/chrome/browser/settings/privacy/BravePrivacyPreferences.java
index b63182d899c..5867f7284f2 100644
--- a/android/java/org/chromium/chrome/browser/settings/privacy/BravePrivacyPreferences.java
+++ b/android/java/org/chromium/chrome/browser/settings/privacy/BravePrivacyPreferences.java
@@ -13,6 +13,7 @@ import android.support.v7.preference.PreferenceFragmentCompat;
 import org.chromium.base.ContextUtils;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.preferences.BravePrefServiceBridge;
+import org.chromium.chrome.browser.preferences.Pref;
 import org.chromium.chrome.browser.preferences.PrefServiceBridge;
 import org.chromium.chrome.browser.settings.ChromeBaseCheckBoxPreference;
 import org.chromium.chrome.browser.settings.ChromeSwitchPreference;
@@ -81,7 +82,7 @@ public class BravePrivacyPreferences extends PrivacyPreferences {
             sharedPreferencesEditor.putBoolean(PREF_CLOSE_TABS_ON_EXIT, (boolean) newValue);
             sharedPreferencesEditor.apply();
         } else if (PREF_SEARCH_SUGGESTIONS.equals(key)) {
-            mPrefServiceBridge.setSearchSuggestEnabled((boolean) newValue);
+            mPrefServiceBridge.setBoolean(Pref.SEARCH_SUGGEST_ENABLED, (boolean) newValue);
         }
 
         return true;
@@ -95,7 +96,7 @@ public class BravePrivacyPreferences extends PrivacyPreferences {
 
     private void updatePreferences() {
         removePreferenceIfPresent(PREF_SYNC_AND_SERVICES_LINK);
-        mSearchSuggestions.setChecked(mPrefServiceBridge.isSearchSuggestEnabled());
+        mSearchSuggestions.setChecked(mPrefServiceBridge.getBoolean(Pref.SEARCH_SUGGEST_ENABLED));
         mSearchSuggestions.setOrder(findPreference(PREF_CLEAR_BROWSING_DATA).getOrder() + 1);
     }
 
@@ -110,7 +111,7 @@ public class BravePrivacyPreferences extends PrivacyPreferences {
         return preference -> {
             String key = preference.getKey();
             if (PREF_SEARCH_SUGGESTIONS.equals(key)) {
-                return mPrefServiceBridge.isSearchSuggestManaged();
+                return mPrefServiceBridge.isManagedPreference(Pref.SEARCH_SUGGEST_ENABLED);
             }
             return false;
         };