Remove StringSet methods from ChromePreferenceManager.

Use SharedPreferencesManager instead.

Bug: 1017800
Change-Id: I67054cbf4ed55c97223258a243b0dab46ff3384c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1888730Reviewed-by: Natalie Chouinard <chouinard@chromium.org>
Reviewed-by: Peter Kotwicz <pkotwicz@chromium.org>
Commit-Queue: Henrique Nakashima <hnakashima@chromium.org>
Cr-Commit-Position: refs/heads/master@{#711699}

chrome/android/java/src/org/chromium/chrome/browser/metrics/WebApkUma.java

@@ -19,6 +19,7 @@ import org.chromium.base.ContextUtils;
 import org.chromium.base.metrics.RecordHistogram;
 import org.chromium.base.task.AsyncTask;
 import org.chromium.chrome.browser.preferences.ChromePreferenceManager;
+import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
 import org.chromium.chrome.browser.util.ConversionUtils;
 import org.chromium.chrome.browser.webapps.WebApkDistributor;
 import org.chromium.chrome.browser.webapps.WebApkUkmRecorder;
@@ -126,8 +127,8 @@ public class WebApkUma {
 
     /** Makes recordings that were deferred in order to not load native. */
     public static void recordDeferredUma() {
-        ChromePreferenceManager preferenceManager = ChromePreferenceManager.getInstance();
-        Set<String> uninstalledPackages = preferenceManager.readStringSet(
+        SharedPreferencesManager preferencesManager = SharedPreferencesManager.getInstance();
+        Set<String> uninstalledPackages = preferencesManager.readStringSet(
                 ChromePreferenceManager.WEBAPK_UNINSTALLED_PACKAGES);
         if (uninstalledPackages.isEmpty()) return;
 
@@ -150,7 +151,7 @@ public class WebApkUma {
                         uninstallTimestamp - webappDataStorage.getWebApkInstallTimestamp());
             }
         }
-        preferenceManager.writeStringSet(
+        preferencesManager.writeStringSet(
                 ChromePreferenceManager.WEBAPK_UNINSTALLED_PACKAGES, new HashSet<String>());
 
         // TODO(http://crbug.com/1000312): Clear WebappDataStorage for uninstalled WebAPK.
@@ -158,7 +159,7 @@ public class WebApkUma {
 
     /** Sets WebAPK uninstall to be recorded next time that native is loaded. */
     public static void deferRecordWebApkUninstalled(String packageName) {
-        ChromePreferenceManager.getInstance().addToStringSet(
+        SharedPreferencesManager.getInstance().addToStringSet(
                 ChromePreferenceManager.WEBAPK_UNINSTALLED_PACKAGES, packageName);
         String webApkId = WebappRegistry.webApkIdForPackage(packageName);
         WebappRegistry.warmUpSharedPrefsForId(webApkId);

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

@@ -391,7 +391,7 @@ public class ChromePreferenceManager {
      * Stores a set of account names on the device when signin promo is shown.
      */
     public void setSigninPromoLastAccountNames(Set<String> accountNames) {
-        writeStringSet(SIGNIN_PROMO_LAST_SHOWN_ACCOUNT_NAMES, accountNames);
+        mManager.writeStringSet(SIGNIN_PROMO_LAST_SHOWN_ACCOUNT_NAMES, accountNames);
     }
 
     /**
@@ -475,7 +475,7 @@ public class ChromePreferenceManager {
     public Set<String> getVerifiedDigitalAssetLinks() {
         // From the official docs, modifying the result of a SharedPreferences.getStringSet can
         // cause bad things to happen including exceptions or ruining the data.
-        return new HashSet<>(readStringSet(VERIFIED_DIGITAL_ASSET_LINKS));
+        return new HashSet<>(mManager.readStringSet(VERIFIED_DIGITAL_ASSET_LINKS));
     }
 
     /**
@@ -483,12 +483,12 @@ public class ChromePreferenceManager {
      * Can be retrieved by {@link #getVerifiedDigitalAssetLinks()}.
      */
     public void setVerifiedDigitalAssetLinks(Set<String> links) {
-        writeStringSet(VERIFIED_DIGITAL_ASSET_LINKS, links);
+        mManager.writeStringSet(VERIFIED_DIGITAL_ASSET_LINKS, links);
     }
 
     /** Do not modify the set returned by this method. */
     private Set<String> getTrustedWebActivityDisclosureAcceptedPackages() {
-        return readStringSet(TRUSTED_WEB_ACTIVITY_DISCLOSURE_ACCEPTED_PACKAGES);
+        return mManager.readStringSet(TRUSTED_WEB_ACTIVITY_DISCLOSURE_ACCEPTED_PACKAGES);
     }
 
     /**
@@ -496,7 +496,7 @@ public class ChromePreferenceManager {
      * TWAs launched by the given package.
      */
     public void setUserAcceptedTwaDisclosureForPackage(String packageName) {
-        addToStringSet(TRUSTED_WEB_ACTIVITY_DISCLOSURE_ACCEPTED_PACKAGES, packageName);
+        mManager.addToStringSet(TRUSTED_WEB_ACTIVITY_DISCLOSURE_ACCEPTED_PACKAGES, packageName);
     }
 
     /**
@@ -504,7 +504,8 @@ public class ChromePreferenceManager {
      * TWAs launched by the given package.
      */
     public void removeTwaDisclosureAcceptanceForPackage(String packageName) {
-        removeFromStringSet(TRUSTED_WEB_ACTIVITY_DISCLOSURE_ACCEPTED_PACKAGES, packageName);
+        mManager.removeFromStringSet(
+                TRUSTED_WEB_ACTIVITY_DISCLOSURE_ACCEPTED_PACKAGES, packageName);
     }
 
     /**
@@ -515,44 +516,6 @@ public class ChromePreferenceManager {
         return getTrustedWebActivityDisclosureAcceptedPackages().contains(packageName);
     }
 
-    /**
-     * Reads set of String values from preferences.
-     *
-     * Note that you must not modify the set instance returned by this call.
-     * @deprecated Use {@link SharedPreferencesManager} instead.
-     */
-    @Deprecated
-    public Set<String> readStringSet(String key) {
-        return mManager.readStringSet(key);
-    }
-
-    /**
-     * Adds a value to string set in shared preferences.
-     * @deprecated Use {@link SharedPreferencesManager} instead.
-     */
-    @Deprecated
-    public void addToStringSet(String key, String value) {
-        mManager.addToStringSet(key, value);
-    }
-
-    /**
-     * Removes value from string set in shared preferences.
-     * @deprecated Use {@link SharedPreferencesManager} instead.
-     */
-    @Deprecated
-    public void removeFromStringSet(String key, String value) {
-        mManager.removeFromStringSet(key, value);
-    }
-
-    /**
-     * Writes string set to shared preferences.
-     * @deprecated Use {@link SharedPreferencesManager} instead.
-     */
-    @Deprecated
-    public void writeStringSet(String key, Set<String> values) {
-        mManager.writeStringSet(key, values);
-    }
-
     /**
      * Writes the given int value to the named shared preference.
      * @param key The name of the preference to modify.

chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappRegistry.java

@@ -23,6 +23,7 @@ import org.chromium.chrome.browser.browserservices.permissiondelegation.TrustedW
 import org.chromium.chrome.browser.browsing_data.UrlFilter;
 import org.chromium.chrome.browser.browsing_data.UrlFilterBridge;
 import org.chromium.chrome.browser.preferences.ChromePreferenceManager;
+import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
 import org.chromium.content_public.browser.UiThreadTaskTraits;
 import org.chromium.webapk.lib.common.WebApkConstants;
 
@@ -298,7 +299,7 @@ public class WebappRegistry {
 
         // Do not delete WebappDataStorage if we still need it for UKM logging.
         Set<String> webApkPackagesWithPendingUkm =
-                ChromePreferenceManager.getInstance().readStringSet(
+                SharedPreferencesManager.getInstance().readStringSet(
                         ChromePreferenceManager.WEBAPK_UNINSTALLED_PACKAGES);
         if (webApkPackagesWithPendingUkm.contains(webApkPackageName)) return false;