Migrate SharedPrefs from ChromeBrowserProvider to ChromePreferenceKeys

Register them in ChromePreferenceKeys and use SharedPreferencesManager
consistently instead of SharedPreferences directly.

Bug: 1022108
Change-Id: I706ca75c671bed29af42f3420ea613f28d4f12a3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1993650Reviewed-by: Theresa  <twellington@chromium.org>
Commit-Queue: Henrique Nakashima <hnakashima@chromium.org>
Cr-Commit-Position: refs/heads/master@{#730176}

chrome/android/java/src/org/chromium/chrome/browser/provider/ChromeBrowserProvider.java

@@ -10,7 +10,6 @@ import android.content.ContentProvider;
 import android.content.ContentUris;
 import android.content.ContentValues;
 import android.content.Context;
-import android.content.SharedPreferences;
 import android.content.UriMatcher;
 import android.content.pm.PackageManager;
 import android.database.Cursor;
@@ -29,7 +28,6 @@ import android.util.LongSparseArray;
 import androidx.annotation.IntDef;
 import androidx.annotation.VisibleForTesting;
 
-import org.chromium.base.ContextUtils;
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.NativeMethods;
@@ -40,6 +38,8 @@ import org.chromium.chrome.browser.IntentHandler;
 import org.chromium.chrome.browser.database.SQLiteCursor;
 import org.chromium.chrome.browser.externalauth.ExternalAuthUtils;
 import org.chromium.chrome.browser.init.ChromeBrowserInitializer;
+import org.chromium.chrome.browser.preferences.ChromePreferenceKeys;
+import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
 import org.chromium.chrome.browser.util.UrlConstants;
 import org.chromium.content_public.browser.BrowserStartupController;
 import org.chromium.content_public.browser.UiThreadTaskTraits;
@@ -140,8 +140,6 @@ public class ChromeBrowserProvider extends ContentProvider {
     // ID used to indicate an invalid id for bookmark nodes.
     private static final long INVALID_BOOKMARK_ID = -1;
 
-    private static final String LAST_MODIFIED_BOOKMARK_FOLDER_ID_KEY = "last_bookmark_folder_id";
-
     private static final int URI_MATCH_BOOKMARKS = 0;
     private static final int URI_MATCH_BOOKMARKS_ID = 1;
     private static final int URL_MATCH_API_BOOKMARK = 2;
@@ -274,10 +272,8 @@ public class ChromeBrowserProvider extends ContentProvider {
      */
     private long getLastModifiedBookmarkFolderId() {
         if (mLastModifiedBookmarkFolderId == INVALID_BOOKMARK_ID) {
-            SharedPreferences sharedPreferences =
-                    ContextUtils.getAppSharedPreferences();
-            mLastModifiedBookmarkFolderId = sharedPreferences.getLong(
-                    LAST_MODIFIED_BOOKMARK_FOLDER_ID_KEY, INVALID_BOOKMARK_ID);
+            mLastModifiedBookmarkFolderId = SharedPreferencesManager.getInstance().readLong(
+                    ChromePreferenceKeys.BOOKMARKS_LAST_MODIFIED_FOLDER_ID, INVALID_BOOKMARK_ID);
         }
         return mLastModifiedBookmarkFolderId;
     }
@@ -605,11 +601,9 @@ public class ChromeBrowserProvider extends ContentProvider {
         if (getLastModifiedBookmarkFolderId() == id) return;
 
         mLastModifiedBookmarkFolderId = id;
-        SharedPreferences sharedPreferences =
-                ContextUtils.getAppSharedPreferences();
-        sharedPreferences.edit()
-                .putLong(LAST_MODIFIED_BOOKMARK_FOLDER_ID_KEY, mLastModifiedBookmarkFolderId)
-                .apply();
+        SharedPreferencesManager.getInstance().writeLong(
+                ChromePreferenceKeys.BOOKMARKS_LAST_MODIFIED_FOLDER_ID,
+                mLastModifiedBookmarkFolderId);
     }
 
     @VisibleForTesting

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

@@ -50,6 +50,7 @@ public final class ChromePreferenceKeys {
     /** Whether Autofill Assistant is enabled */
     public static final String AUTOFILL_ASSISTANT_ENABLED = "autofill_assistant_switch";
 
+    public static final String BOOKMARKS_LAST_MODIFIED_FOLDER_ID = "last_bookmark_folder_id";
     public static final String BOOKMARKS_LAST_USED_URL = "enhanced_bookmark_last_used_url";
     public static final String BOOKMARKS_LAST_USED_PARENT =
             "enhanced_bookmark_last_used_parent_folder";
@@ -582,6 +583,7 @@ public final class ChromePreferenceKeys {
         return Arrays.asList(
                 ACCESSIBILITY_TAB_SWITCHER,
                 AUTOFILL_ASSISTANT_ENABLED,
+                BOOKMARKS_LAST_MODIFIED_FOLDER_ID,
                 BOOKMARKS_LAST_USED_URL,
                 BOOKMARKS_LAST_USED_PARENT,
                 CHROME_DEFAULT_BROWSER,