Add the flag for the experiment to change "incognito" to "private"

Bug: 865140
Change-Id: Id58e74ea8cda672252b5f6abce911ce7d849ee3e
Reviewed-on: https://chromium-review.googlesource.com/1142448
Commit-Queue: Jian Li <jianli@chromium.org>
Reviewed-by: Dmitry Titov <dimich@chromium.org>
Cr-Commit-Position: refs/heads/master@{#577223}

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

@@ -217,6 +217,7 @@ public abstract class ChromeFeatureList {
     public static final String HOME_PAGE_BUTTON_FORCE_ENABLED = "HomePageButtonForceEnabled";
     public static final String HOMEPAGE_TILE = "HomepageTile";
     public static final String HORIZONTAL_TAB_SWITCHER_ANDROID = "HorizontalTabSwitcherAndroid";
+    public static final String INCOGNITO_STRINGS = "IncognitoStrings";
     public static final String INTEREST_FEED_CONTENT_SUGGESTIONS = "InterestFeedContentSuggestions";
     public static final String LANGUAGES_PREFERENCE = "LanguagesPreference";
     public static final String SEARCH_ENGINE_PROMO_EXISTING_DEVICE =

chrome/browser/about_flags.cc

@@ -4135,6 +4135,12 @@ const FeatureEntry kFeatureEntries[] = {
      flag_descriptions::kEnableSyncUSSBookmarksDescription, kOsAll,
      FEATURE_VALUE_TYPE(switches::kSyncUSSBookmarks)},
 
+#if defined(OS_ANDROID)
+    {"incognito-strings", flag_descriptions::kIncognitoStringsName,
+     flag_descriptions::kIncognitoStringsDescription, kOsAndroid,
+     FEATURE_VALUE_TYPE(chrome::android::kIncognitoStrings)},
+#endif
+
     // NOTE: Adding a new flag requires adding a corresponding entry to enum
     // "LoginCustomFlags" in tools/metrics/histograms/enums.xml. See "Flag
     // Histograms" in tools/metrics/histograms/README.md (run the

chrome/browser/android/chrome_feature_list.cc

@@ -107,6 +107,7 @@ const base::Feature* kFeaturesExposedToJava[] = {
     &kHomepageTile,
     &kHorizontalTabSwitcherAndroid,
     &kImprovedA2HS,
+    &kIncognitoStrings,
     &kLanguagesPreference,
     &kModalPermissionDialogView,
     &kNewContactsPicker,
@@ -302,6 +303,9 @@ const base::Feature kHorizontalTabSwitcherAndroid{
 const base::Feature kImprovedA2HS{"ImprovedA2HS",
                                   base::FEATURE_ENABLED_BY_DEFAULT};
 
+const base::Feature kIncognitoStrings{"IncognitoStrings",
+                                      base::FEATURE_DISABLED_BY_DEFAULT};
+
 const base::Feature kLanguagesPreference{"LanguagesPreference",
                                          base::FEATURE_ENABLED_BY_DEFAULT};
 

chrome/browser/android/chrome_feature_list.h

@@ -53,6 +53,7 @@ extern const base::Feature kHomePageButtonForceEnabled;
 extern const base::Feature kHomepageTile;
 extern const base::Feature kHorizontalTabSwitcherAndroid;
 extern const base::Feature kImprovedA2HS;
+extern const base::Feature kIncognitoStrings;
 extern const base::Feature kLanguagesPreference;
 extern const base::Feature kModalPermissionDialogView;
 extern const base::Feature kSearchEnginePromoExistingDevice;

chrome/browser/flag_descriptions.cc

@@ -2395,6 +2395,10 @@ const char kHomepageTileDescription[] =
     "When NTPButton is enabled, the first tile of the Suggested Tiles will be "
     "used for homepage. It will not have an effect when NTPButton is disabled.";
 
+const char kIncognitoStringsName[] = "Alternate incognito strings";
+const char kIncognitoStringsDescription[] =
+    "Show alternate incognito strings if enabled.";
+
 const char kInterestFeedContentSuggestionsDescription[] =
     "Use the interest feed to render content suggestions. Currently "
     "content "

chrome/browser/flag_descriptions.h

@@ -1451,6 +1451,9 @@ extern const char kHomePageButtonDescription[];
 extern const char kHomepageTileName[];
 extern const char kHomepageTileDescription[];
 
+extern const char kIncognitoStringsName[];
+extern const char kIncognitoStringsDescription[];
+
 extern const char kInterestFeedContentSuggestionsName[];
 extern const char kInterestFeedContentSuggestionsDescription[];
 

tools/metrics/histograms/enums.xml

@@ -27909,6 +27909,7 @@ from previous Chrome versions.
   <int value="-1259901957" label="VrBrowserKeyboard:disabled"/>
   <int value="-1255427595" label="HomePageButtonForceEnabled:enabled"/>
   <int value="-1254070521" label="enable-slimming-paint-invalidation"/>
+  <int value="-1253608371" label="IncognitoStrings:disabled"/>
   <int value="-1251411236" label="disable-new-md-input-view"/>
   <int value="-1250611337" label="ChromeVoxArcSupport:disabled"/>
   <int value="-1248478422" label="enable-zip-archiver-packer"/>
@@ -28718,6 +28719,7 @@ from previous Chrome versions.
   <int value="497137719" label="OmniboxVoiceSearchAlwaysVisible:disabled"/>
   <int value="500177932" label="ArcSmartTextSelection:disabled"/>
   <int value="501477022" label="DrawOcclusion:enabled"/>
+  <int value="502551931" label="IncognitoStrings:enabled"/>
   <int value="503189154" label="ViewsBrowserWindows:disabled"/>
   <int value="503245473" label="disable-translate-new-ux"/>
   <int value="504994663" label="GenericSensor:disabled"/>