Add ChromePreferenceKeys to chrome/browser/preferences.

Move contextualsearch/ constants into it.

Not moving all of the constants in ChromePreferenceManager at once
so that the review is more focused.

Bug: 1022107

Change-Id: I1da396bb180e5a7c05be42390d06e507a3771ff1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1900575
Commit-Queue: Henrique Nakashima <hnakashima@chromium.org>
Reviewed-by: Donn Denman <donnd@chromium.org>
Reviewed-by: Natalie Chouinard <chouinard@chromium.org>
Reviewed-by: Theresa  <twellington@chromium.org>
Cr-Commit-Position: refs/heads/master@{#713585}

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

@@ -7,7 +7,7 @@ package org.chromium.chrome.browser.contextualsearch;
 import androidx.annotation.Nullable;
 
 import org.chromium.chrome.browser.contextualsearch.ContextualSearchInteractionRecorder.Feature;
-import org.chromium.chrome.browser.preferences.ChromePreferenceManager;
+import org.chromium.chrome.browser.preferences.ChromePreferenceKeys;
 import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
 
 import java.util.Map;
@@ -71,40 +71,38 @@ class ContextualSearchInteractionPersisterImpl implements ContextualSearchIntera
     /** @param eventId An event ID to write to local storage. */
     private void writeEventIDToPersistantStorage(long eventId) {
         SharedPreferencesManager.getInstance().writeLong(
-                ChromePreferenceManager.CONTEXTUAL_SEARCH_PREVIOUS_INTERACTION_EVENT_ID, eventId);
+                ChromePreferenceKeys.CONTEXTUAL_SEARCH_PREVIOUS_INTERACTION_EVENT_ID, eventId);
     }
 
     /** @return The event ID from local storage. */
     private long readEventIdFromPersistantStorage() {
         return SharedPreferencesManager.getInstance().readLong(
-                ChromePreferenceManager.CONTEXTUAL_SEARCH_PREVIOUS_INTERACTION_EVENT_ID,
-                NO_EVENT_ID);
+                ChromePreferenceKeys.CONTEXTUAL_SEARCH_PREVIOUS_INTERACTION_EVENT_ID, NO_EVENT_ID);
     }
 
     /** @param bitEncodedValue An encoded outcome to write to local storage. */
     private void writeOutcomesToPersistantStorage(int bitEncodedValue) {
         SharedPreferencesManager.getInstance().writeInt(
-                ChromePreferenceManager.CONTEXTUAL_SEARCH_PREVIOUS_INTERACTION_ENCODED_OUTCOMES,
+                ChromePreferenceKeys.CONTEXTUAL_SEARCH_PREVIOUS_INTERACTION_ENCODED_OUTCOMES,
                 bitEncodedValue);
     }
 
     /** @return The encoded outcome from local storage. */
     private int readOutcomesFromPersistantStorage() {
         return SharedPreferencesManager.getInstance().readInt(
-                ChromePreferenceManager.CONTEXTUAL_SEARCH_PREVIOUS_INTERACTION_ENCODED_OUTCOMES);
+                ChromePreferenceKeys.CONTEXTUAL_SEARCH_PREVIOUS_INTERACTION_ENCODED_OUTCOMES);
     }
 
     /** Writes the current time stamp to local storage. */
     private void writeTimestampToPersistantStorage(long timestamp) {
         SharedPreferencesManager.getInstance().writeLong(
-                ChromePreferenceManager.CONTEXTUAL_SEARCH_PREVIOUS_INTERACTION_TIMESTAMP,
-                timestamp);
+                ChromePreferenceKeys.CONTEXTUAL_SEARCH_PREVIOUS_INTERACTION_TIMESTAMP, timestamp);
     }
 
     /** @return The time stamp when we wrote the outcome to local storage. */
     private long readTimestampFromPersistantStorage() {
         return SharedPreferencesManager.getInstance().readLong(
-                ChromePreferenceManager.CONTEXTUAL_SEARCH_PREVIOUS_INTERACTION_TIMESTAMP, 0);
+                ChromePreferenceKeys.CONTEXTUAL_SEARCH_PREVIOUS_INTERACTION_TIMESTAMP, 0);
     }
 
     /**

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

@@ -20,7 +20,7 @@ import org.chromium.chrome.browser.compositor.bottombar.contextualsearch.Context
 import org.chromium.chrome.browser.contextualsearch.ContextualSearchFieldTrial.ContextualSearchSetting;
 import org.chromium.chrome.browser.contextualsearch.ContextualSearchFieldTrial.ContextualSearchSwitch;
 import org.chromium.chrome.browser.contextualsearch.ContextualSearchSelectionController.SelectionType;
-import org.chromium.chrome.browser.preferences.ChromePreferenceManager;
+import org.chromium.chrome.browser.preferences.ChromePreferenceKeys;
 import org.chromium.chrome.browser.preferences.PrefServiceBridge;
 import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
 import org.chromium.chrome.browser.util.UrlConstants;
@@ -197,14 +197,13 @@ class ContextualSearchPolicy {
             if (promoTapCounter.isEnabled()) promoTapCounter.increment();
         }
         int tapsSinceOpen = mPreferencesManager.incrementInt(
-                ChromePreferenceManager.CONTEXTUAL_SEARCH_TAP_SINCE_OPEN_COUNT);
+                ChromePreferenceKeys.CONTEXTUAL_SEARCH_TAP_SINCE_OPEN_COUNT);
         if (isUserUndecided()) {
             ContextualSearchUma.logTapsSinceOpenForUndecided(tapsSinceOpen);
         } else {
             ContextualSearchUma.logTapsSinceOpenForDecided(tapsSinceOpen);
         }
-        mPreferencesManager.incrementInt(
-                ChromePreferenceManager.CONTEXTUAL_SEARCH_ALL_TIME_TAP_COUNT);
+        mPreferencesManager.incrementInt(ChromePreferenceKeys.CONTEXTUAL_SEARCH_ALL_TIME_TAP_COUNT);
     }
 
     /**
@@ -213,9 +212,9 @@ class ContextualSearchPolicy {
     void updateCountersForOpen() {
         // Always completely reset the tap counters that accumulate only since the last open.
         mPreferencesManager.writeInt(
-                ChromePreferenceManager.CONTEXTUAL_SEARCH_TAP_SINCE_OPEN_COUNT, 0);
+                ChromePreferenceKeys.CONTEXTUAL_SEARCH_TAP_SINCE_OPEN_COUNT, 0);
         mPreferencesManager.writeInt(
-                ChromePreferenceManager.CONTEXTUAL_SEARCH_TAP_SINCE_OPEN_QUICK_ANSWER_COUNT, 0);
+                ChromePreferenceKeys.CONTEXTUAL_SEARCH_TAP_SINCE_OPEN_QUICK_ANSWER_COUNT, 0);
 
         // Disable the "promo tap" counter, but only if we're using the Opt-out onboarding.
         // For Opt-in, we never disable the promo tap counter.
@@ -224,11 +223,11 @@ class ContextualSearchPolicy {
 
             // Bump the total-promo-opens counter.
             int count = mPreferencesManager.incrementInt(
-                    ChromePreferenceManager.CONTEXTUAL_SEARCH_PROMO_OPEN_COUNT);
+                    ChromePreferenceKeys.CONTEXTUAL_SEARCH_PROMO_OPEN_COUNT);
             ContextualSearchUma.logPromoOpenCount(count);
         }
         mPreferencesManager.incrementInt(
-                ChromePreferenceManager.CONTEXTUAL_SEARCH_ALL_TIME_OPEN_COUNT);
+                ChromePreferenceKeys.CONTEXTUAL_SEARCH_ALL_TIME_OPEN_COUNT);
     }
 
     /**
@@ -240,9 +239,9 @@ class ContextualSearchPolicy {
     void updateCountersForQuickAnswer(boolean wasActivatedByTap, boolean doesAnswer) {
         if (wasActivatedByTap && doesAnswer) {
             mPreferencesManager.incrementInt(
-                    ChromePreferenceManager.CONTEXTUAL_SEARCH_TAP_SINCE_OPEN_QUICK_ANSWER_COUNT);
+                    ChromePreferenceKeys.CONTEXTUAL_SEARCH_TAP_SINCE_OPEN_QUICK_ANSWER_COUNT);
             mPreferencesManager.incrementInt(
-                    ChromePreferenceManager.CONTEXTUAL_SEARCH_ALL_TIME_TAP_QUICK_ANSWER_COUNT);
+                    ChromePreferenceKeys.CONTEXTUAL_SEARCH_ALL_TIME_TAP_QUICK_ANSWER_COUNT);
         }
     }
 
@@ -343,10 +342,10 @@ class ContextualSearchPolicy {
         if (selectionType == SelectionType.TAP) {
             long currentTimeMillis = System.currentTimeMillis();
             long lastAnimatedTimeMillis = mPreferencesManager.readLong(
-                    ChromePreferenceManager.CONTEXTUAL_SEARCH_LAST_ANIMATION_TIME);
+                    ChromePreferenceKeys.CONTEXTUAL_SEARCH_LAST_ANIMATION_TIME);
             if (Math.abs(currentTimeMillis - lastAnimatedTimeMillis) > DateUtils.DAY_IN_MILLIS) {
                 mPreferencesManager.writeLong(
-                        ChromePreferenceManager.CONTEXTUAL_SEARCH_LAST_ANIMATION_TIME,
+                        ChromePreferenceKeys.CONTEXTUAL_SEARCH_LAST_ANIMATION_TIME,
                         currentTimeMillis);
                 return true;
             } else {
@@ -391,8 +390,7 @@ class ContextualSearchPolicy {
      */
     @VisibleForTesting
     int getPromoOpenCount() {
-        return mPreferencesManager.readInt(
-                ChromePreferenceManager.CONTEXTUAL_SEARCH_PROMO_OPEN_COUNT);
+        return mPreferencesManager.readInt(ChromePreferenceKeys.CONTEXTUAL_SEARCH_PROMO_OPEN_COUNT);
     }
 
     /**
@@ -401,7 +399,7 @@ class ContextualSearchPolicy {
     @VisibleForTesting
     int getTapCount() {
         return mPreferencesManager.readInt(
-                ChromePreferenceManager.CONTEXTUAL_SEARCH_TAP_SINCE_OPEN_COUNT);
+                ChromePreferenceKeys.CONTEXTUAL_SEARCH_TAP_SINCE_OPEN_COUNT);
     }
 
     // --------------------------------------------------------------------------------------------

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

@@ -6,7 +6,7 @@ package org.chromium.chrome.browser.contextualsearch;
 
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.NativeMethods;
-import org.chromium.chrome.browser.preferences.ChromePreferenceManager;
+import org.chromium.chrome.browser.preferences.ChromePreferenceKeys;
 import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
 
 /**
@@ -149,14 +149,12 @@ public class CtrSuppression extends ContextualSearchHeuristic {
      *         or we have never checked.
      */
     private boolean didWeekChange(int currentWeekNumber) {
-        if (mPreferenceManager.readInt(
-                    ChromePreferenceManager.CONTEXTUAL_SEARCH_CURRENT_WEEK_NUMBER)
+        if (mPreferenceManager.readInt(ChromePreferenceKeys.CONTEXTUAL_SEARCH_CURRENT_WEEK_NUMBER)
                 == currentWeekNumber) {
             return false;
         } else {
             mPreferenceManager.writeInt(
-                    ChromePreferenceManager.CONTEXTUAL_SEARCH_CURRENT_WEEK_NUMBER,
-                    currentWeekNumber);
+                    ChromePreferenceKeys.CONTEXTUAL_SEARCH_CURRENT_WEEK_NUMBER, currentWeekNumber);
             return true;
         }
     }

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

@@ -5,7 +5,7 @@
 package org.chromium.chrome.browser.contextualsearch;
 
 import org.chromium.base.VisibleForTesting;
-import org.chromium.chrome.browser.preferences.ChromePreferenceManager;
+import org.chromium.chrome.browser.preferences.ChromePreferenceKeys;
 import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
 
 /**
@@ -52,7 +52,7 @@ class DisableablePromoTapCounter {
     private DisableablePromoTapCounter(SharedPreferencesManager prefsManager) {
         mPrefsManager = prefsManager;
         setRawCounter(prefsManager.readInt(
-                ChromePreferenceManager.CONTEXTUAL_SEARCH_TAP_TRIGGERED_PROMO_COUNT));
+                ChromePreferenceKeys.CONTEXTUAL_SEARCH_TAP_TRIGGERED_PROMO_COUNT));
     }
 
     /**
@@ -108,7 +108,7 @@ class DisableablePromoTapCounter {
      */
     private void writeRawCounter() {
         mPrefsManager.writeInt(
-                ChromePreferenceManager.CONTEXTUAL_SEARCH_TAP_TRIGGERED_PROMO_COUNT, mCounter);
+                ChromePreferenceKeys.CONTEXTUAL_SEARCH_TAP_TRIGGERED_PROMO_COUNT, mCounter);
     }
 
     /**

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

@@ -5,7 +5,7 @@
 package org.chromium.chrome.browser.contextualsearch;
 
 import org.chromium.chrome.browser.contextualsearch.ContextualSearchFieldTrial.ContextualSearchSwitch;
-import org.chromium.chrome.browser.preferences.ChromePreferenceManager;
+import org.chromium.chrome.browser.preferences.ChromePreferenceKeys;
 import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
 
 /**
@@ -27,23 +27,22 @@ public class EngagementSuppression extends ContextualSearchHeuristic {
         // OR had a Quick Action presented but none taken and at least one ignored.
         boolean hadEntityImpression =
                 mPreferenceManager.readInt(
-                        ChromePreferenceManager.CONTEXTUAL_SEARCH_ENTITY_IMPRESSIONS_COUNT)
+                        ChromePreferenceKeys.CONTEXTUAL_SEARCH_ENTITY_IMPRESSIONS_COUNT)
                 > 0;
-        boolean hadEntityOpen =
-                mPreferenceManager.readInt(
-                        ChromePreferenceManager.CONTEXTUAL_SEARCH_ENTITY_OPENS_COUNT)
+        boolean hadEntityOpen = mPreferenceManager.readInt(
+                                        ChromePreferenceKeys.CONTEXTUAL_SEARCH_ENTITY_OPENS_COUNT)
                 > 0;
         boolean hadQuickActionImpression =
                 mPreferenceManager.readInt(
-                        ChromePreferenceManager.CONTEXTUAL_SEARCH_QUICK_ACTION_IMPRESSIONS_COUNT)
+                        ChromePreferenceKeys.CONTEXTUAL_SEARCH_QUICK_ACTION_IMPRESSIONS_COUNT)
                 > 0;
         boolean hadQuickActionTaken =
                 mPreferenceManager.readInt(
-                        ChromePreferenceManager.CONTEXTUAL_SEARCH_QUICK_ACTIONS_TAKEN_COUNT)
+                        ChromePreferenceKeys.CONTEXTUAL_SEARCH_QUICK_ACTIONS_TAKEN_COUNT)
                 > 0;
         boolean hadQuickActionIgnored =
                 mPreferenceManager.readInt(
-                        ChromePreferenceManager.CONTEXTUAL_SEARCH_QUICK_ACTIONS_IGNORED_COUNT)
+                        ChromePreferenceKeys.CONTEXTUAL_SEARCH_QUICK_ACTIONS_IGNORED_COUNT)
                 > 0;
         mIsConditionSatisfied = (hadEntityImpression && !hadEntityOpen)
                 || (hadQuickActionImpression && !hadQuickActionTaken && hadQuickActionIgnored);
@@ -58,13 +57,11 @@ public class EngagementSuppression extends ContextualSearchHeuristic {
     public static void registerQuickActionImpression(
             boolean wasPanelOpened, boolean wasActionClicked) {
         SharedPreferencesManager prefs = SharedPreferencesManager.getInstance();
-        prefs.incrementInt(
-                ChromePreferenceManager.CONTEXTUAL_SEARCH_QUICK_ACTION_IMPRESSIONS_COUNT);
+        prefs.incrementInt(ChromePreferenceKeys.CONTEXTUAL_SEARCH_QUICK_ACTION_IMPRESSIONS_COUNT);
         if (wasActionClicked) {
-            prefs.incrementInt(ChromePreferenceManager.CONTEXTUAL_SEARCH_QUICK_ACTIONS_TAKEN_COUNT);
+            prefs.incrementInt(ChromePreferenceKeys.CONTEXTUAL_SEARCH_QUICK_ACTIONS_TAKEN_COUNT);
         } else if (wasPanelOpened) {
-            prefs.incrementInt(
-                    ChromePreferenceManager.CONTEXTUAL_SEARCH_QUICK_ACTIONS_IGNORED_COUNT);
+            prefs.incrementInt(ChromePreferenceKeys.CONTEXTUAL_SEARCH_QUICK_ACTIONS_IGNORED_COUNT);
         }
     }
 
@@ -75,9 +72,9 @@ public class EngagementSuppression extends ContextualSearchHeuristic {
      */
     public static void registerContextualCardsImpression(boolean wasPanelOpened) {
         SharedPreferencesManager prefs = SharedPreferencesManager.getInstance();
-        prefs.incrementInt(ChromePreferenceManager.CONTEXTUAL_SEARCH_ENTITY_IMPRESSIONS_COUNT);
+        prefs.incrementInt(ChromePreferenceKeys.CONTEXTUAL_SEARCH_ENTITY_IMPRESSIONS_COUNT);
         if (wasPanelOpened) {
-            prefs.incrementInt(ChromePreferenceManager.CONTEXTUAL_SEARCH_ENTITY_OPENS_COUNT);
+            prefs.incrementInt(ChromePreferenceKeys.CONTEXTUAL_SEARCH_ENTITY_OPENS_COUNT);
         }
     }
 
@@ -95,29 +92,29 @@ public class EngagementSuppression extends ContextualSearchHeuristic {
         // These counters are updated in ContextualSearchPolcy when taps and opens are registered.
         logger.logFeature(ContextualSearchInteractionRecorder.Feature.TAP_COUNT,
                 mPreferenceManager.readInt(
-                        ChromePreferenceManager.CONTEXTUAL_SEARCH_ALL_TIME_TAP_COUNT));
+                        ChromePreferenceKeys.CONTEXTUAL_SEARCH_ALL_TIME_TAP_COUNT));
         logger.logFeature(ContextualSearchInteractionRecorder.Feature.OPEN_COUNT,
                 mPreferenceManager.readInt(
-                        ChromePreferenceManager.CONTEXTUAL_SEARCH_ALL_TIME_OPEN_COUNT));
+                        ChromePreferenceKeys.CONTEXTUAL_SEARCH_ALL_TIME_OPEN_COUNT));
         logger.logFeature(ContextualSearchInteractionRecorder.Feature.QUICK_ANSWER_COUNT,
                 mPreferenceManager.readInt(
-                        ChromePreferenceManager.CONTEXTUAL_SEARCH_ALL_TIME_TAP_QUICK_ANSWER_COUNT));
+                        ChromePreferenceKeys.CONTEXTUAL_SEARCH_ALL_TIME_TAP_QUICK_ANSWER_COUNT));
         // These counters are updated in the #registerX static methods of this class.
         logger.logFeature(ContextualSearchInteractionRecorder.Feature.ENTITY_IMPRESSIONS_COUNT,
                 mPreferenceManager.readInt(
-                        ChromePreferenceManager.CONTEXTUAL_SEARCH_ENTITY_IMPRESSIONS_COUNT));
+                        ChromePreferenceKeys.CONTEXTUAL_SEARCH_ENTITY_IMPRESSIONS_COUNT));
         logger.logFeature(ContextualSearchInteractionRecorder.Feature.ENTITY_OPENS_COUNT,
                 mPreferenceManager.readInt(
-                        ChromePreferenceManager.CONTEXTUAL_SEARCH_ENTITY_OPENS_COUNT));
+                        ChromePreferenceKeys.CONTEXTUAL_SEARCH_ENTITY_OPENS_COUNT));
         logger.logFeature(
                 ContextualSearchInteractionRecorder.Feature.QUICK_ACTION_IMPRESSIONS_COUNT,
                 mPreferenceManager.readInt(
-                        ChromePreferenceManager.CONTEXTUAL_SEARCH_QUICK_ACTION_IMPRESSIONS_COUNT));
+                        ChromePreferenceKeys.CONTEXTUAL_SEARCH_QUICK_ACTION_IMPRESSIONS_COUNT));
         logger.logFeature(ContextualSearchInteractionRecorder.Feature.QUICK_ACTIONS_TAKEN_COUNT,
                 mPreferenceManager.readInt(
-                        ChromePreferenceManager.CONTEXTUAL_SEARCH_QUICK_ACTIONS_TAKEN_COUNT));
+                        ChromePreferenceKeys.CONTEXTUAL_SEARCH_QUICK_ACTIONS_TAKEN_COUNT));
         logger.logFeature(ContextualSearchInteractionRecorder.Feature.QUICK_ACTIONS_IGNORED_COUNT,
                 mPreferenceManager.readInt(
-                        ChromePreferenceManager.CONTEXTUAL_SEARCH_QUICK_ACTIONS_IGNORED_COUNT));
+                        ChromePreferenceKeys.CONTEXTUAL_SEARCH_QUICK_ACTIONS_IGNORED_COUNT));
     }
 }

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

@@ -12,6 +12,8 @@ import java.util.Set;
 
 /**
  * ChromePreferenceManager stores and retrieves various values in Android shared preferences.
+ *
+ * TODO(crbug.com/1022107): Finish moving constants to ChromePreferenceKeys.
  */
 public class ChromePreferenceManager {
     // For new int values with a default of 0, just document the key and its usage, and call
@@ -19,82 +21,6 @@ public class ChromePreferenceManager {
     // For new boolean values, document the key and its usage, call #readBoolean and #writeBoolean
     // directly. While calling #readBoolean, default value is required.
 
-    /** An all-time counter of taps that triggered the Contextual Search peeking panel. */
-    public static final String CONTEXTUAL_SEARCH_ALL_TIME_TAP_COUNT =
-            "contextual_search_all_time_tap_count";
-    /** An all-time counter of Contextual Search panel opens triggered by any gesture.*/
-    public static final String CONTEXTUAL_SEARCH_ALL_TIME_OPEN_COUNT =
-            "contextual_search_all_time_open_count";
-    /**
-     * The number of times a tap gesture caused a Contextual Search Quick Answer to be shown.
-     * Cumulative, starting at M-69.
-     */
-    public static final String CONTEXTUAL_SEARCH_ALL_TIME_TAP_QUICK_ANSWER_COUNT =
-            "contextual_search_all_time_tap_quick_answer_count";
-    /**
-     * The number of times that a tap triggered the Contextual Search panel to peek since the last
-     * time the panel was opened.  Note legacy string value without "open".
-     */
-    public static final String CONTEXTUAL_SEARCH_TAP_SINCE_OPEN_COUNT =
-            "contextual_search_tap_count";
-    /**
-     * The number of times a tap gesture caused a Contextual Search Quick Answer to be shown since
-     * the last time the panel was opened.  Note legacy string value without "open".
-     */
-    public static final String CONTEXTUAL_SEARCH_TAP_SINCE_OPEN_QUICK_ANSWER_COUNT =
-            "contextual_search_tap_quick_answer_count";
-    /**
-     * The number of times the Contextual Search panel was opened with the opt-in promo visible.
-     */
-    public static final String CONTEXTUAL_SEARCH_PROMO_OPEN_COUNT =
-            "contextual_search_promo_open_count";
-    /**
-     * The entity-data impressions count for Contextual Search, i.e. thumbnails shown in the Bar.
-     * Cumulative, starting at M-69.
-     */
-    public static final String CONTEXTUAL_SEARCH_ENTITY_IMPRESSIONS_COUNT =
-            "contextual_search_entity_impressions_count";
-    /**
-     * The entity-data opens count for Contextual Search, e.g. Panel opens following thumbnails
-     * shown in the Bar. Cumulative, starting at M-69.
-     */
-    public static final String CONTEXTUAL_SEARCH_ENTITY_OPENS_COUNT =
-            "contextual_search_entity_opens_count";
-    /**
-     * The Quick Action impressions count for Contextual Search, i.e. actions presented in the Bar.
-     * Cumulative, starting at M-69.
-     */
-    public static final String CONTEXTUAL_SEARCH_QUICK_ACTION_IMPRESSIONS_COUNT =
-            "contextual_search_quick_action_impressions_count";
-    /**
-     * The Quick Actions taken count for Contextual Search, i.e. phone numbers dialed and similar
-     * actions. Cumulative, starting at M-69.
-     */
-    public static final String CONTEXTUAL_SEARCH_QUICK_ACTIONS_TAKEN_COUNT =
-            "contextual_search_quick_actions_taken_count";
-    /**
-     * The Quick Actions ignored count, i.e. phone numbers available but not dialed.
-     * Cumulative, starting at M-69.
-     */
-    public static final String CONTEXTUAL_SEARCH_QUICK_ACTIONS_IGNORED_COUNT =
-            "contextual_search_quick_actions_ignored_count";
-    /**
-     * A user interaction event ID for interaction with Contextual Search, stored as a long.
-     */
-    public static final String CONTEXTUAL_SEARCH_PREVIOUS_INTERACTION_EVENT_ID =
-            "contextual_search_previous_interaction_event_id";
-    /**
-     * An encoded set of outcomes of user interaction with Contextual Search, stored as an int.
-     */
-    public static final String CONTEXTUAL_SEARCH_PREVIOUS_INTERACTION_ENCODED_OUTCOMES =
-            "contextual_search_previous_interaction_encoded_outcomes";
-    /**
-     * A timestamp indicating when we updated the user interaction with Contextual Search, stored
-     * as a long, with resolution in days.
-     */
-    public static final String CONTEXTUAL_SEARCH_PREVIOUS_INTERACTION_TIMESTAMP =
-            "contextual_search_previous_interaction_timestamp";
-
     /**
      * Whether the promotion for data reduction has been skipped on first invocation.
      * Default value is false.
@@ -117,13 +43,6 @@ public class ChromePreferenceManager {
     @Deprecated
     private static final String PREF_WEBSITE_SETTINGS_FILTER = "website_settings_filter";
 
-    public static final String CONTEXTUAL_SEARCH_TAP_TRIGGERED_PROMO_COUNT =
-            "contextual_search_tap_triggered_promo_count";
-    public static final String CONTEXTUAL_SEARCH_LAST_ANIMATION_TIME =
-            "contextual_search_last_animation_time";
-    public static final String CONTEXTUAL_SEARCH_CURRENT_WEEK_NUMBER =
-            "contextual_search_current_week_number";
-
     /**
      * Whether Chrome is set as the default browser.
      * Default value is false.

chrome/browser/preferences/BUILD.gn

@@ -5,7 +5,10 @@
 import("//build/config/android/rules.gni")
 
 android_library("java") {
-  java_files = [ "android/java/src/org/chromium/chrome/browser/preferences/SharedPreferencesManager.java" ]
+  java_files = [
+    "android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java",
+    "android/java/src/org/chromium/chrome/browser/preferences/SharedPreferencesManager.java",
+  ]
   deps = [
     "//base:base_java",
   ]

chrome/browser/preferences/OWNERS

 chouinard@chromium.org
 hnakashima@chromium.org
+
+per-file *ChromePreferenceKeys.java=*
+
+# COMPONENT: Internals>Preferences

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

+// Copyright 2019 The Chromium Authors. All rights reserved.
+// 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.preferences;
+
+/**
+ * Contains String constants with the SharedPreferences keys used by Chrome.
+ *
+ * All Chrome layer SharedPreferences keys should be added here.
+ *
+ * Do not remove constants from here. Keys that were used in past versions but are not used anymore
+ * cannot be reused. Mark them as @Deprecated.
+ *
+ * TODO(crbug.com/1022107): Finish moving constants from ChromePreferenceManager.
+ * TODO(crbug.com/1013781): Implement key deprecation. For now, just mark them as @Deprecated.
+ */
+public final class ChromePreferenceKeys {
+    /** An all-time counter of taps that triggered the Contextual Search peeking panel. */
+    public static final String CONTEXTUAL_SEARCH_ALL_TIME_TAP_COUNT =
+            "contextual_search_all_time_tap_count";
+    /** An all-time counter of Contextual Search panel opens triggered by any gesture.*/
+    public static final String CONTEXTUAL_SEARCH_ALL_TIME_OPEN_COUNT =
+            "contextual_search_all_time_open_count";
+    /**
+     * The number of times a tap gesture caused a Contextual Search Quick Answer to be shown.
+     * Cumulative, starting at M-69.
+     */
+    public static final String CONTEXTUAL_SEARCH_ALL_TIME_TAP_QUICK_ANSWER_COUNT =
+            "contextual_search_all_time_tap_quick_answer_count";
+    /**
+     * The number of times that a tap triggered the Contextual Search panel to peek since the last
+     * time the panel was opened.  Note legacy string value without "open".
+     */
+    public static final String CONTEXTUAL_SEARCH_TAP_SINCE_OPEN_COUNT =
+            "contextual_search_tap_count";
+    /**
+     * The number of times a tap gesture caused a Contextual Search Quick Answer to be shown since
+     * the last time the panel was opened.  Note legacy string value without "open".
+     */
+    public static final String CONTEXTUAL_SEARCH_TAP_SINCE_OPEN_QUICK_ANSWER_COUNT =
+            "contextual_search_tap_quick_answer_count";
+    /**
+     * The number of times the Contextual Search panel was opened with the opt-in promo visible.
+     */
+    public static final String CONTEXTUAL_SEARCH_PROMO_OPEN_COUNT =
+            "contextual_search_promo_open_count";
+    /**
+     * The entity-data impressions count for Contextual Search, i.e. thumbnails shown in the Bar.
+     * Cumulative, starting at M-69.
+     */
+    public static final String CONTEXTUAL_SEARCH_ENTITY_IMPRESSIONS_COUNT =
+            "contextual_search_entity_impressions_count";
+    /**
+     * The entity-data opens count for Contextual Search, e.g. Panel opens following thumbnails
+     * shown in the Bar. Cumulative, starting at M-69.
+     */
+    public static final String CONTEXTUAL_SEARCH_ENTITY_OPENS_COUNT =
+            "contextual_search_entity_opens_count";
+    /**
+     * The Quick Action impressions count for Contextual Search, i.e. actions presented in the Bar.
+     * Cumulative, starting at M-69.
+     */
+    public static final String CONTEXTUAL_SEARCH_QUICK_ACTION_IMPRESSIONS_COUNT =
+            "contextual_search_quick_action_impressions_count";
+    /**
+     * The Quick Actions taken count for Contextual Search, i.e. phone numbers dialed and similar
+     * actions. Cumulative, starting at M-69.
+     */
+    public static final String CONTEXTUAL_SEARCH_QUICK_ACTIONS_TAKEN_COUNT =
+            "contextual_search_quick_actions_taken_count";
+    /**
+     * The Quick Actions ignored count, i.e. phone numbers available but not dialed.
+     * Cumulative, starting at M-69.
+     */
+    public static final String CONTEXTUAL_SEARCH_QUICK_ACTIONS_IGNORED_COUNT =
+            "contextual_search_quick_actions_ignored_count";
+    /**
+     * A user interaction event ID for interaction with Contextual Search, stored as a long.
+     */
+    public static final String CONTEXTUAL_SEARCH_PREVIOUS_INTERACTION_EVENT_ID =
+            "contextual_search_previous_interaction_event_id";
+    /**
+     * An encoded set of outcomes of user interaction with Contextual Search, stored as an int.
+     */
+    public static final String CONTEXTUAL_SEARCH_PREVIOUS_INTERACTION_ENCODED_OUTCOMES =
+            "contextual_search_previous_interaction_encoded_outcomes";
+    /**
+     * A timestamp indicating when we updated the user interaction with Contextual Search, stored
+     * as a long, with resolution in days.
+     */
+    public static final String CONTEXTUAL_SEARCH_PREVIOUS_INTERACTION_TIMESTAMP =
+            "contextual_search_previous_interaction_timestamp";
+    public static final String CONTEXTUAL_SEARCH_TAP_TRIGGERED_PROMO_COUNT =
+            "contextual_search_tap_triggered_promo_count";
+    public static final String CONTEXTUAL_SEARCH_LAST_ANIMATION_TIME =
+            "contextual_search_last_animation_time";
+    public static final String CONTEXTUAL_SEARCH_CURRENT_WEEK_NUMBER =
+            "contextual_search_current_week_number";
+
+    private ChromePreferenceKeys() {}
+}