Move a SharedPref from customtabs to ChromePreferenceKeys

Register it in ChromePreferenceKeys and use SharedPreferencesManager
consistently instead of SharedPreferences direct

Bug: 1022108
Change-Id: I5bd6ce1ac802ff3a77e2173fdaf51226ee89702d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2033629Reviewed-by: Peter Conn <peconn@chromium.org>
Commit-Queue: Henrique Nakashima <hnakashima@chromium.org>
Cr-Commit-Position: refs/heads/master@{#737930}

chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivityLifecycleUmaTracker.java

@@ -4,10 +4,8 @@
 
 package org.chromium.chrome.browser.customtabs;
 
-import android.content.SharedPreferences;
 import android.text.TextUtils;
 
-import org.chromium.base.ContextUtils;
 import org.chromium.base.metrics.RecordHistogram;
 import org.chromium.base.metrics.RecordUserAction;
 import org.chromium.base.task.PostTask;
@@ -19,6 +17,8 @@ import org.chromium.chrome.browser.gsa.GSAState;
 import org.chromium.chrome.browser.lifecycle.ActivityLifecycleDispatcher;
 import org.chromium.chrome.browser.lifecycle.NativeInitObserver;
 import org.chromium.chrome.browser.lifecycle.PauseResumeWithNativeObserver;
+import org.chromium.chrome.browser.preferences.ChromePreferenceKeys;
+import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
 import org.chromium.chrome.browser.rappor.RapporServiceBridge;
 import org.chromium.chrome.browser.webapps.WebappCustomTabTimeSpentLogger;
 import org.chromium.content_public.browser.UiThreadTaskTraits;
@@ -31,7 +31,6 @@ import javax.inject.Inject;
 @ActivityScope
 public class CustomTabActivityLifecycleUmaTracker implements PauseResumeWithNativeObserver,
         NativeInitObserver {
-    private static final String LAST_URL_PREF = "pref_last_custom_tab_url";
 
     private final BrowserServicesIntentDataProvider mIntentDataProvider;
     private final ChromeActivity<?> mActivity;
@@ -60,13 +59,14 @@ public class CustomTabActivityLifecycleUmaTracker implements PauseResumeWithNati
                 RecordUserAction.record("CustomTabs.StartedReopened");
             }
         } else {
-            SharedPreferences preferences = ContextUtils.getAppSharedPreferences();
-            String lastUrl = preferences.getString(LAST_URL_PREF, null);
+            SharedPreferencesManager preferences = SharedPreferencesManager.getInstance();
+            String lastUrl =
+                    preferences.readString(ChromePreferenceKeys.CUSTOM_TABS_LAST_URL, null);
             String urlToLoad = mIntentDataProvider.getUrlToLoad();
             if (lastUrl != null && lastUrl.equals(urlToLoad)) {
                 RecordUserAction.record("CustomTabsMenuOpenSameUrl");
             } else {
-                preferences.edit().putString(LAST_URL_PREF, urlToLoad).apply();
+                preferences.writeString(ChromePreferenceKeys.CUSTOM_TABS_LAST_URL, urlToLoad);
             }
 
             if (mIntentDataProvider.isOpenedByChrome()) {

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

@@ -188,6 +188,7 @@ public final class ChromePreferenceKeys {
 
     public static final KeyPrefix CUSTOM_TABS_DEX_LAST_UPDATE_TIME_PREF_PREFIX =
             new KeyPrefix("pref_local_custom_tabs_module_dex_last_update_time_*");
+    public static final String CUSTOM_TABS_LAST_URL = "pref_last_custom_tab_url";
 
     /**
      * Key used to save the time in milliseconds since epoch that the first run experience or second
@@ -787,6 +788,7 @@ public final class ChromePreferenceKeys {
                 CRASH_UPLOAD_SUCCESS_GPU,
                 CRASH_UPLOAD_SUCCESS_OTHER,
                 CRASH_UPLOAD_SUCCESS_RENDERER,
+                CUSTOM_TABS_LAST_URL,
                 DATA_REDUCTION_DISPLAYED_FRE_OR_SECOND_PROMO_TIME_MS,
                 DATA_REDUCTION_DISPLAYED_FRE_OR_SECOND_PROMO_VERSION,
                 DATA_REDUCTION_DISPLAYED_FRE_OR_SECOND_RUN_PROMO,