Remove Boolean methods from ChromePreferenceManager.

Use SharedPreferencesManager instead.

Bug: 1017800
Change-Id: I0144bae75ac9d128923fad991a8ffbbe60df073e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1896118
Commit-Queue: Henrique Nakashima <hnakashima@chromium.org>
Reviewed-by: Theresa  <twellington@chromium.org>
Reviewed-by: Natalie Chouinard <chouinard@chromium.org>
Cr-Commit-Position: refs/heads/master@{#713045}

chrome/android/features/vr/java/src/org/chromium/chrome/browser/vr/VrShellDelegate.java

@@ -56,6 +56,7 @@ import org.chromium.chrome.browser.help.HelpAndFeedback;
 import org.chromium.chrome.browser.infobar.InfoBarIdentifier;
 import org.chromium.chrome.browser.infobar.SimpleConfirmInfoBarBuilder;
 import org.chromium.chrome.browser.preferences.ChromePreferenceManager;
+import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.tabmodel.TabModelSelector;
 import org.chromium.chrome.browser.webapps.WebappActivity;
@@ -720,7 +721,7 @@ public class VrShellDelegate
             VrShellDelegateJni.get().registerVrAssetsComponent();
             sRegisteredVrAssetsComponent = true;
         }
-        ChromePreferenceManager.getInstance().writeBoolean(
+        SharedPreferencesManager.getInstance().writeBoolean(
                 ChromePreferenceManager.SHOULD_REGISTER_VR_ASSETS_COMPONENT_ON_STARTUP,
                 isDaydreamCurrentViewer);
     }

chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java

@@ -112,6 +112,7 @@ import org.chromium.chrome.browser.partnercustomizations.HomepageManager;
 import org.chromium.chrome.browser.partnercustomizations.PartnerBrowserCustomizations;
 import org.chromium.chrome.browser.preferences.ChromePreferenceManager;
 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.search_engines.SearchEngineChoiceNotification;
 import org.chromium.chrome.browser.signin.SigninPromoUtil;
@@ -800,7 +801,7 @@ public class ChromeTabbedActivity extends ChromeActivity implements ScreenshotMo
     private void createToolbarButtonInProductHelpController() {
         try (TraceEvent e = TraceEvent.scoped(
                      "ChromeTabbedActivity.createToolbarButtonInProductHelpController")) {
-            ChromePreferenceManager preferenceManager = ChromePreferenceManager.getInstance();
+            SharedPreferencesManager preferenceManager = SharedPreferencesManager.getInstance();
             // Promos can only be shown when we start with ACTION_MAIN intent and
             // after FRE is complete. Native initialization can finish before the FRE flow is
             // complete, and this will only show promos on the second opportunity. This is

chrome/android/java/src/org/chromium/chrome/browser/DefaultBrowserInfo.java

@@ -23,6 +23,7 @@ import org.chromium.base.task.AsyncTask;
 import org.chromium.base.task.BackgroundOnlyAsyncTask;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.preferences.ChromePreferenceManager;
+import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
 import org.chromium.content_public.browser.BrowserStartupController;
 
 import java.lang.annotation.Retention;
@@ -103,7 +104,7 @@ public final class DefaultBrowserInfo {
                         boolean isDefault = info != null && info.match != 0
                                 && TextUtils.equals(
                                            context.getPackageName(), info.activityInfo.packageName);
-                        ChromePreferenceManager.getInstance().writeBoolean(
+                        SharedPreferencesManager.getInstance().writeBoolean(
                                 ChromePreferenceManager.CHROME_DEFAULT_BROWSER, isDefault);
 
                         // Check if there is a default handler for the Intent.  If so, store its

chrome/android/java/src/org/chromium/chrome/browser/component_updater/VrAssetsComponentInstaller.java

@@ -7,13 +7,14 @@ package org.chromium.chrome.browser.component_updater;
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.JNINamespace;
 import org.chromium.chrome.browser.preferences.ChromePreferenceManager;
+import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
 
 /** Java-side implementation of the VrAssetsComponentInstaller. */
 @JNINamespace("component_updater")
 public class VrAssetsComponentInstaller {
     @CalledByNative
     private static boolean shouldRegisterOnStartup() {
-        return ChromePreferenceManager.getInstance().readBoolean(
+        return SharedPreferencesManager.getInstance().readBoolean(
                 ChromePreferenceManager.SHOULD_REGISTER_VR_ASSETS_COMPONENT_ON_STARTUP, false);
     }
 }

chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java

@@ -23,6 +23,7 @@ import org.chromium.chrome.browser.contextmenu.ChromeContextMenuItem.Item;
 import org.chromium.chrome.browser.firstrun.FirstRunStatus;
 import org.chromium.chrome.browser.locale.LocaleManager;
 import org.chromium.chrome.browser.preferences.ChromePreferenceManager;
+import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
 import org.chromium.chrome.browser.search_engines.TemplateUrlServiceFactory;
 import org.chromium.chrome.browser.share.LensUtils;
 import org.chromium.chrome.browser.share.ShareParams;
@@ -428,7 +429,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
                     }
                 } catch (URISyntaxException ignore) {
                 }
-                if (ChromePreferenceManager.getInstance().readBoolean(
+                if (SharedPreferencesManager.getInstance().readBoolean(
                             ChromePreferenceManager.CHROME_DEFAULT_BROWSER, false)
                         && addNewEntries) {
                     if (mDelegate.isIncognitoSupported()) {

chrome/android/java/src/org/chromium/chrome/browser/device/DeviceClassManager.java

@@ -8,6 +8,7 @@ import org.chromium.base.CommandLine;
 import org.chromium.base.SysUtils;
 import org.chromium.chrome.browser.ChromeSwitches;
 import org.chromium.chrome.browser.preferences.ChromePreferenceManager;
+import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
 import org.chromium.chrome.browser.util.AccessibilityUtil;
 import org.chromium.ui.base.DeviceFormFactor;
 
@@ -95,7 +96,7 @@ public class DeviceClassManager {
     public static boolean enableAccessibilityLayout() {
         if (getInstance().mEnableAccessibilityLayout) return true;
         if (!AccessibilityUtil.isAccessibilityEnabled()) return false;
-        return ChromePreferenceManager.getInstance().readBoolean(
+        return SharedPreferencesManager.getInstance().readBoolean(
                 ChromePreferenceManager.ACCESSIBILITY_TAB_SWITCHER, true);
     }
 
@@ -112,7 +113,7 @@ public class DeviceClassManager {
     public static boolean enableAnimations() {
         if (!getInstance().mEnableAnimations) return false;
         if (!AccessibilityUtil.isAccessibilityEnabled()) return true;
-        return !ChromePreferenceManager.getInstance().readBoolean(
+        return !SharedPreferencesManager.getInstance().readBoolean(
                 ChromePreferenceManager.ACCESSIBILITY_TAB_SWITCHER, true);
     }
 

chrome/android/java/src/org/chromium/chrome/browser/instantapps/InstantAppsHandler.java

@@ -22,6 +22,7 @@ import org.chromium.chrome.browser.IntentHandler;
 import org.chromium.chrome.browser.ShortcutHelper;
 import org.chromium.chrome.browser.externalnav.ExternalNavigationDelegateImpl;
 import org.chromium.chrome.browser.preferences.ChromePreferenceManager;
+import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.util.IntentUtils;
 import org.chromium.content_public.browser.WebContents;
@@ -330,7 +331,7 @@ public class InstantAppsHandler {
 
     /** @return Whether Chrome is the default browser on the device. */
     private boolean isChromeDefaultHandler(Context context) {
-        return ChromePreferenceManager.getInstance().readBoolean(
+        return SharedPreferencesManager.getInstance().readBoolean(
                 ChromePreferenceManager.CHROME_DEFAULT_BROWSER, false);
     }
 

chrome/android/java/src/org/chromium/chrome/browser/night_mode/WebContentsDarkModeController.java

@@ -11,7 +11,6 @@ import android.text.TextUtils;
 import org.chromium.base.ApplicationState;
 import org.chromium.base.ApplicationStatus;
 import org.chromium.base.ApplicationStatus.ApplicationStateListener;
-import org.chromium.chrome.browser.preferences.ChromePreferenceManager;
 import org.chromium.chrome.browser.preferences.PrefServiceBridge;
 import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
 
@@ -57,7 +56,7 @@ public class WebContentsDarkModeController implements ApplicationStateListener {
 
     private static boolean shouldEnableWebContentsDarkMode() {
         return GlobalNightModeStateProviderHolder.getInstance().isInNightMode()
-                && ChromePreferenceManager.getInstance().readBoolean(
+                && SharedPreferencesManager.getInstance().readBoolean(
                         DARKEN_WEBSITES_ENABLED_KEY, false);
     }
 

chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/SignInPromo.java

@@ -14,6 +14,7 @@ import org.chromium.base.ContextUtils;
 import org.chromium.base.VisibleForTesting;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.preferences.ChromePreferenceManager;
+import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
 import org.chromium.chrome.browser.signin.ProfileDataCache;
 import org.chromium.chrome.browser.signin.SigninManager;
 import org.chromium.chrome.browser.signin.SigninManager.SignInAllowedObserver;
@@ -107,7 +108,7 @@ public class SignInPromo extends OptionalLeaf {
     /** @return Whether the {@link SignInPromo} should be created. */
     public static boolean shouldCreatePromo() {
         return !sDisablePromoForTests
-                && !ChromePreferenceManager.getInstance().readBoolean(
+                && !SharedPreferencesManager.getInstance().readBoolean(
                         ChromePreferenceManager.NTP_SIGNIN_PROMO_DISMISSED, false)
                 && !getSuppressionStatus();
     }
@@ -163,7 +164,7 @@ public class SignInPromo extends OptionalLeaf {
         mDismissed = true;
         updateVisibility();
 
-        ChromePreferenceManager.getInstance().writeBoolean(
+        SharedPreferencesManager.getInstance().writeBoolean(
                 ChromePreferenceManager.NTP_SIGNIN_PROMO_DISMISSED, true);
 
         final @StringRes int promoHeader = mSigninPromoController.getDescriptionStringId();

chrome/android/java/src/org/chromium/chrome/browser/preferences/AccessibilityPreferences.java

@@ -72,7 +72,7 @@ public class AccessibilityPreferences
                         ChromePreferenceManager.ACCESSIBILITY_TAB_SWITCHER);
         if (AccessibilityUtil.isAccessibilityEnabled()) {
             mAccessibilityTabSwitcherPref.setChecked(
-                    ChromePreferenceManager.getInstance().readBoolean(
+                    SharedPreferencesManager.getInstance().readBoolean(
                             ChromePreferenceManager.ACCESSIBILITY_TAB_SWITCHER, true));
         } else {
             getPreferenceScreen().removePreference(mAccessibilityTabSwitcherPref);

chrome/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceManager.java

@@ -465,29 +465,4 @@ public class ChromePreferenceManager {
     public boolean hasUserAcceptedTwaDisclosureForPackage(String packageName) {
         return getTrustedWebActivityDisclosureAcceptedPackages().contains(packageName);
     }
-
-    /**
-     * Writes the given boolean to the named shared preference.
-     *
-     * @param key The name of the preference to modify.
-     * @param value The new value for the preference.
-     * @deprecated Use {@link SharedPreferencesManager} instead.
-     */
-    @Deprecated
-    public void writeBoolean(String key, boolean value) {
-        mManager.writeBoolean(key, value);
-    }
-
-    /**
-     * Reads the given boolean value from the named shared preference.
-     *
-     * @param key The name of the preference to return.
-     * @param defaultValue The default value to return if there's no value stored.
-     * @return The value of the preference if stored; defaultValue otherwise.
-     * @deprecated Use {@link SharedPreferencesManager} instead.
-     */
-    @Deprecated
-    public boolean readBoolean(String key, boolean defaultValue) {
-        return mManager.readBoolean(key, defaultValue);
-    }
 }

chrome/android/java/src/org/chromium/chrome/browser/preferences/sync/SignInPreference.java

@@ -18,6 +18,7 @@ import org.chromium.chrome.R;
 import org.chromium.chrome.browser.firstrun.FirstRunSignInProcessor;
 import org.chromium.chrome.browser.preferences.ChromePreferenceManager;
 import org.chromium.chrome.browser.preferences.ManagedPreferencesUtils;
+import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
 import org.chromium.chrome.browser.signin.DisplayableProfileData;
 import org.chromium.chrome.browser.signin.IdentityServicesProvider;
 import org.chromium.chrome.browser.signin.PersonalizedSigninPromoView;
@@ -166,7 +167,7 @@ public class SignInPreference
             return;
         }
 
-        boolean personalizedPromoDismissed = ChromePreferenceManager.getInstance().readBoolean(
+        boolean personalizedPromoDismissed = SharedPreferencesManager.getInstance().readBoolean(
                 ChromePreferenceManager.SETTINGS_PERSONALIZED_SIGNIN_PROMO_DISMISSED, false);
         if (!mPersonalizedPromoEnabled || personalizedPromoDismissed) {
             setupGenericPromo();
@@ -278,7 +279,7 @@ public class SignInPreference
                 (PersonalizedSigninPromoView) holder.findViewById(R.id.signin_promo_view_container);
         SigninPromoUtil.setupPromoViewFromCache(
                 mSigninPromoController, mProfileDataCache, signinPromoView, () -> {
-                    ChromePreferenceManager.getInstance().writeBoolean(
+                    SharedPreferencesManager.getInstance().writeBoolean(
                             ChromePreferenceManager.SETTINGS_PERSONALIZED_SIGNIN_PROMO_DISMISSED,
                             true);
                     update();

chrome/android/java/src/org/chromium/chrome/browser/suggestions/SuggestionsMetrics.java

@@ -16,6 +16,7 @@ import org.chromium.chrome.browser.ntp.snippets.SnippetArticle;
 import org.chromium.chrome.browser.preferences.ChromePreferenceManager;
 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.suggestions.mostvisited.MostVisitedSitesBridge;
 import org.chromium.chrome.browser.tab.Tab;
 
@@ -28,10 +29,10 @@ public abstract class SuggestionsMetrics {
     // UI Element interactions
 
     public static void recordSurfaceVisible() {
-        if (!ChromePreferenceManager.getInstance().readBoolean(
+        if (!SharedPreferencesManager.getInstance().readBoolean(
                     ChromePreferenceManager.CONTENT_SUGGESTIONS_SHOWN_KEY, false)) {
             RecordUserAction.record("Suggestions.FirstTimeSurfaceVisible");
-            ChromePreferenceManager.getInstance().writeBoolean(
+            SharedPreferencesManager.getInstance().writeBoolean(
                     ChromePreferenceManager.CONTENT_SUGGESTIONS_SHOWN_KEY, true);
         }
 

chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarTablet.java

@@ -34,6 +34,7 @@ import org.chromium.chrome.browser.omnibox.LocationBar;
 import org.chromium.chrome.browser.omnibox.LocationBarTablet;
 import org.chromium.chrome.browser.partnercustomizations.HomepageManager;
 import org.chromium.chrome.browser.preferences.ChromePreferenceManager;
+import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.toolbar.HomeButton;
 import org.chromium.chrome.browser.toolbar.KeyboardNavigationListener;
@@ -713,7 +714,7 @@ public class ToolbarTablet extends ToolbarLayout
     }
 
     private boolean isAccessibilityTabSwitcherPreferenceEnabled() {
-        return ChromePreferenceManager.getInstance().readBoolean(
+        return SharedPreferencesManager.getInstance().readBoolean(
                 ChromePreferenceManager.ACCESSIBILITY_TAB_SWITCHER, true);
     }
 }

chrome/android/javatests/src/org/chromium/chrome/browser/feed/FeedNewTabPageTest.java

@@ -48,6 +48,7 @@ import org.chromium.chrome.browser.ntp.snippets.SectionHeader;
 import org.chromium.chrome.browser.preferences.ChromePreferenceManager;
 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.suggestions.SiteSuggestion;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.util.UrlConstants;
@@ -176,10 +177,10 @@ public class FeedNewTabPageTest {
     @MediumTest
     @Feature({"FeedNewTabPage"})
     public void testSignInPromo_DismissBySwipe() {
-        boolean dismissed = ChromePreferenceManager.getInstance().readBoolean(
+        boolean dismissed = SharedPreferencesManager.getInstance().readBoolean(
                 ChromePreferenceManager.NTP_SIGNIN_PROMO_DISMISSED, false);
         if (dismissed) {
-            ChromePreferenceManager.getInstance().writeBoolean(
+            SharedPreferencesManager.getInstance().writeBoolean(
                     ChromePreferenceManager.NTP_SIGNIN_PROMO_DISMISSED, false);
         }
 
@@ -203,7 +204,7 @@ public class FeedNewTabPageTest {
         onView(withId(R.id.ntp_content)).check(matches(isDisplayed()));
 
         // Reset state.
-        ChromePreferenceManager.getInstance().writeBoolean(
+        SharedPreferencesManager.getInstance().writeBoolean(
                 ChromePreferenceManager.NTP_SIGNIN_PROMO_DISMISSED, dismissed);
     }
 

chrome/android/junit/src/org/chromium/chrome/browser/ntp/cards/NewTabPageAdapterTest.java

@@ -71,6 +71,7 @@ import org.chromium.chrome.browser.offlinepages.OfflinePageBridge;
 import org.chromium.chrome.browser.preferences.ChromePreferenceManager;
 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.signin.SigninManager;
 import org.chromium.chrome.browser.suggestions.ContentSuggestionsAdditionalAction;
 import org.chromium.chrome.browser.suggestions.DestructionObserver;
@@ -337,7 +338,7 @@ public class NewTabPageAdapterTest {
     @After
     public void tearDown() {
         CardsVariationParameters.setTestVariationParams(null);
-        ChromePreferenceManager.getInstance().writeBoolean(
+        SharedPreferencesManager.getInstance().writeBoolean(
                 ChromePreferenceManager.NTP_SIGNIN_PROMO_DISMISSED, false);
         ChromePreferenceManager.getInstance().clearNewTabPageSigninPromoSuppressionPeriodStart();
         PrefServiceBridge.setInstanceForTesting(null);
@@ -1040,7 +1041,7 @@ public class NewTabPageAdapterTest {
 
         when(mMockSigninManager.isSignInAllowed()).thenReturn(true);
         when(mMockIdentityManager.hasPrimaryAccount()).thenReturn(false);
-        ChromePreferenceManager.getInstance().writeBoolean(
+        SharedPreferencesManager.getInstance().writeBoolean(
                 ChromePreferenceManager.NTP_SIGNIN_PROMO_DISMISSED, false);
         useArticleCategory();
 
@@ -1052,7 +1053,7 @@ public class NewTabPageAdapterTest {
 
         verify(itemDismissedCallback).onResult(anyString());
         assertFalse(isSignInPromoVisible());
-        assertTrue(ChromePreferenceManager.getInstance().readBoolean(
+        assertTrue(SharedPreferencesManager.getInstance().readBoolean(
                 ChromePreferenceManager.NTP_SIGNIN_PROMO_DISMISSED, false));
         reloadNtp();
         assertFalse(isSignInPromoVisible());

chrome/test/android/javatests/src/org/chromium/chrome/test/util/NewTabPageTestUtils.java

@@ -13,6 +13,7 @@ import android.os.Build;
 import org.chromium.chrome.browser.ntp.IncognitoNewTabPage;
 import org.chromium.chrome.browser.ntp.NewTabPage;
 import org.chromium.chrome.browser.preferences.ChromePreferenceManager;
+import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
 import org.chromium.chrome.browser.suggestions.SiteSuggestion;
 import org.chromium.chrome.browser.suggestions.tile.TileSectionType;
 import org.chromium.chrome.browser.suggestions.tile.TileSource;
@@ -99,7 +100,7 @@ public class NewTabPageTestUtils {
         Account account = AccountManagerFacade.createAccountFromName("test@gmail.com");
         fakeAccountManager.addAccountHolderExplicitly(new AccountHolder.Builder(account).build());
         assertFalse(AccountManagerFacade.get().isUpdatePending().get());
-        assertFalse(ChromePreferenceManager.getInstance().readBoolean(
+        assertFalse(SharedPreferencesManager.getInstance().readBoolean(
                 ChromePreferenceManager.NTP_SIGNIN_PROMO_DISMISSED, false));
     }
 }