Clank: Convert various PrefServiceBridge uses to PrefService.

Bug: 1071603
Change-Id: Ib53af1b0ed6ca217b0e3b78a5fd41c5eefe240af
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2304136Reviewed-by: Ted Choc <tedchoc@chromium.org>
Commit-Queue: Evan Stade <estade@chromium.org>
Cr-Commit-Position: refs/heads/master@{#789599}

chrome/android/chrome_test_java_sources.gni

@@ -243,6 +243,7 @@ chrome_test_java_sources = [
   "javatests/src/org/chromium/chrome/browser/interstitials/LookalikeInterstitialTest.java",
   "javatests/src/org/chromium/chrome/browser/jsdialog/JavascriptAppModalDialogTest.java",
   "javatests/src/org/chromium/chrome/browser/jsdialog/JavascriptTabModalDialogTest.java",
+  "javatests/src/org/chromium/chrome/browser/language/settings/LanguageSettingsTest.java",
   "javatests/src/org/chromium/chrome/browser/locale/DefaultSearchEngineDialogHelperTest.java",
   "javatests/src/org/chromium/chrome/browser/locale/DefaultSearchEngineDialogHelperUtils.java",
   "javatests/src/org/chromium/chrome/browser/locale/DefaultSearchEnginePromoDialogTest.java",
@@ -457,7 +458,6 @@ chrome_test_java_sources = [
   "javatests/src/org/chromium/chrome/browser/services/GoogleServicesManagerIntegrationTest.java",
   "javatests/src/org/chromium/chrome/browser/settings/MainSettingsFragmentTest.java",
   "javatests/src/org/chromium/chrome/browser/settings/SettingsActivityTest.java",
-  "javatests/src/org/chromium/chrome/browser/settings/language/LanguageSettingsTest.java",
   "javatests/src/org/chromium/chrome/browser/shape_detection/ShapeDetectionTest.java",
   "javatests/src/org/chromium/chrome/browser/share/LensUtilsTest.java",
   "javatests/src/org/chromium/chrome/browser/share/ShareButtonControllerTest.java",

chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedSurfaceMediator.java

@@ -32,7 +32,6 @@ import org.chromium.chrome.browser.ntp.cards.promo.HomepagePromoVariationManager
 import org.chromium.chrome.browser.ntp.snippets.SectionHeader;
 import org.chromium.chrome.browser.preferences.Pref;
 import org.chromium.chrome.browser.preferences.PrefChangeRegistrar;
-import org.chromium.chrome.browser.preferences.PrefServiceBridge;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.search_engines.TemplateUrlServiceFactory;
 import org.chromium.chrome.browser.signin.IdentityServicesProvider;
@@ -290,8 +289,7 @@ class FeedSurfaceMediator implements NewTabPageLayout.ScrollDelegate,
     private boolean createSignInPromoIfNeeded() {
         if (!SignInPromo.shouldCreatePromo()) return false;
         if (mSignInPromo == null) {
-            boolean suggestionsVisible =
-                    PrefServiceBridge.getInstance().getBoolean(Pref.ARTICLES_LIST_VISIBLE);
+            boolean suggestionsVisible = getPrefService().getBoolean(Pref.ARTICLES_LIST_VISIBLE);
 
             mSignInPromo = new FeedSignInPromo(mSigninManager);
             mSignInPromo.setCanShowPersonalizedSuggestions(suggestionsVisible);

chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchPolicy.java

@@ -75,10 +75,6 @@ class ContextualSearchPolicy {
         mSearchPanel = panel;
     }
 
-    // TODO(donnd): Consider adding a test-only constructor that uses dependency injection of a
-    // preference manager and PrefServiceBridge.  Currently this is not possible because the
-    // PrefServiceBridge is final.
-
     /**
      * @return The number of additional times to show the promo on tap, 0 if it should not be shown,
      *         or a negative value if the counter has been disabled or the user has accepted
@@ -489,7 +485,6 @@ class ContextualSearchPolicy {
      *         on enabling or disabling the feature.
      */
     boolean isUserUndecided() {
-        // TODO(donnd) use dependency injection for the PrefServiceBridge instead!
         if (mDidOverrideDecidedStateForTesting) return !mDecidedStateForTesting;
 
         return ContextualSearchManager.isContextualSearchUninitialized();

chrome/android/java/src/org/chromium/chrome/browser/language/settings/LanguageSettings.java

@@ -8,6 +8,7 @@ import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
 
+import androidx.annotation.VisibleForTesting;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceFragmentCompat;
 
@@ -92,7 +93,8 @@ public class LanguageSettings
         startActivityForResult(intent, REQUEST_CODE_ADD_LANGUAGES);
     }
 
-    private PrefService getPrefService() {
+    @VisibleForTesting
+    static PrefService getPrefService() {
         return UserPrefs.get(Profile.getLastUsedRegularProfile());
     }
 }

chrome/android/javatests/src/org/chromium/chrome/browser/settings/language/LanguageSettingsTest.java → chrome/android/javatests/src/org/chromium/chrome/browser/language/settings/LanguageSettingsTest.java

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package org.chromium.chrome.browser.settings.language;
+package org.chromium.chrome.browser.language.settings;
 
 import static androidx.test.espresso.Espresso.onView;
 import static androidx.test.espresso.action.ViewActions.click;
@@ -33,11 +33,7 @@ import org.chromium.base.test.util.CommandLineFlags;
 import org.chromium.base.test.util.Restriction;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.flags.ChromeSwitches;
-import org.chromium.chrome.browser.language.settings.LanguageItem;
-import org.chromium.chrome.browser.language.settings.LanguageListBaseAdapter;
-import org.chromium.chrome.browser.language.settings.LanguageSettings;
 import org.chromium.chrome.browser.preferences.Pref;
-import org.chromium.chrome.browser.preferences.PrefServiceBridge;
 import org.chromium.chrome.browser.settings.SettingsActivity;
 import org.chromium.chrome.browser.settings.SettingsActivityTestRule;
 import org.chromium.chrome.browser.translate.TranslateBridge;
@@ -148,8 +144,8 @@ public class LanguageSettingsTest {
         onView(allOf(hasSibling(withText(R.string.languages_item_option_offer_to_translate)),
                        withId(R.id.menu_item_end_icon)))
                 .check((v, e) -> {
-                    Assert.assertNotNull(
-                            "There should exist an icon next to the text to indicate 'offer to translate' is on",
+                    Assert.assertNotNull("There should exist an icon next to the text to indicate "
+                                    + "'offer to translate' is on",
                             ((ImageView) v).getDrawable());
                 });
 
@@ -187,9 +183,9 @@ public class LanguageSettingsTest {
         boolean enabledInDefault = pref.isChecked();
         TestThreadUtils.runOnUiThreadBlocking(() -> {
             boolean enabled =
-                    PrefServiceBridge.getInstance().getBoolean(Pref.OFFER_TRANSLATE_ENABLED);
-            Assert.assertEquals(
-                    "The state of switch widget is different from local preference of 'offer to translate'.",
+                    LanguageSettings.getPrefService().getBoolean(Pref.OFFER_TRANSLATE_ENABLED);
+            Assert.assertEquals("The state of switch widget is different from local preference of "
+                            + "'offer to translate'.",
                     enabledInDefault, enabled);
         });
 
@@ -204,10 +200,10 @@ public class LanguageSettingsTest {
         // Toggle the switch.
         onView(withId(R.id.switchWidget)).perform(click());
         TestThreadUtils.runOnUiThreadBlocking(() -> {
-            Assert.assertEquals(
-                    "Preference of 'offer to translate' should be toggled when switch widget is clicked.",
+            Assert.assertEquals("Preference of 'offer to translate' should be toggled when switch "
+                            + "widget is clicked.",
                     !enabledInDefault,
-                    PrefServiceBridge.getInstance().getBoolean(Pref.OFFER_TRANSLATE_ENABLED));
+                    LanguageSettings.getPrefService().getBoolean(Pref.OFFER_TRANSLATE_ENABLED));
         });
 
         TestThreadUtils.runOnUiThreadBlocking((Runnable) moreButton::performClick);
@@ -217,7 +213,7 @@ public class LanguageSettingsTest {
 
         // Reset state.
         TestThreadUtils.runOnUiThreadBlocking(() -> {
-            PrefServiceBridge.getInstance().setBoolean(
+            LanguageSettings.getPrefService().setBoolean(
                     Pref.OFFER_TRANSLATE_ENABLED, enabledInDefault);
         });
     }

chrome/android/javatests/src/org/chromium/chrome/browser/ntp/cards/promo/HomepagePromoTest.java

@@ -57,8 +57,8 @@ import org.chromium.chrome.browser.ntp.cards.promo.HomepagePromoUtils.HomepagePr
 import org.chromium.chrome.browser.partnercustomizations.BasePartnerBrowserCustomizationIntegrationTestRule;
 import org.chromium.chrome.browser.preferences.ChromePreferenceKeys;
 import org.chromium.chrome.browser.preferences.Pref;
-import org.chromium.chrome.browser.preferences.PrefServiceBridge;
 import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
+import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.toolbar.HomeButton;
 import org.chromium.chrome.browser.toolbar.ToolbarManager;
@@ -75,6 +75,7 @@ import org.chromium.components.embedder_support.util.UrlConstants;
 import org.chromium.components.feature_engagement.EventConstants;
 import org.chromium.components.feature_engagement.FeatureConstants;
 import org.chromium.components.feature_engagement.Tracker;
+import org.chromium.components.user_prefs.UserPrefs;
 import org.chromium.content_public.browser.test.util.Criteria;
 import org.chromium.content_public.browser.test.util.CriteriaHelper;
 import org.chromium.content_public.browser.test.util.TestThreadUtils;
@@ -293,7 +294,8 @@ public class HomepagePromoTest {
     public void testToggleFeed_WithHomepage() {
         // Test to toggle NTP when feed is hidden.
         TestThreadUtils.runOnUiThreadBlocking(() -> {
-            PrefServiceBridge.getInstance().setBoolean(Pref.ARTICLES_LIST_VISIBLE, false);
+            UserPrefs.get(Profile.getLastUsedRegularProfile())
+                    .setBoolean(Pref.ARTICLES_LIST_VISIBLE, false);
         });
         launchNewTabPage();
 

chrome/android/javatests/src/org/chromium/chrome/browser/settings/SettingsActivityTest.java

@@ -19,8 +19,9 @@ import org.junit.runner.RunWith;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.init.ChromeBrowserInitializer;
 import org.chromium.chrome.browser.preferences.Pref;
-import org.chromium.chrome.browser.preferences.PrefServiceBridge;
+import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
+import org.chromium.components.user_prefs.UserPrefs;
 import org.chromium.content_public.browser.test.util.CriteriaHelper;
 import org.chromium.content_public.browser.test.util.TestThreadUtils;
 import org.chromium.policy.test.annotations.Policies;
@@ -42,8 +43,8 @@ public class SettingsActivityTest {
                 () -> { ChromeBrowserInitializer.getInstance().handleSynchronousStartup(); });
 
         CriteriaHelper.pollUiThread(() -> {
-            return PrefServiceBridge.getInstance().isManagedPreference(
-                    Pref.CREDENTIALS_ENABLE_SERVICE);
+            return UserPrefs.get(Profile.getLastUsedRegularProfile())
+                    .isManagedPreference(Pref.CREDENTIALS_ENABLE_SERVICE);
         });
 
         mSettingsActivityTestRule.startSettingsActivity();