Expose kImprovedCookieControls feature flag to java

Exposed this feature flag that makes it easier for users to enable and
manage third party cookie blocking in android.

Bug: 1040091
Change-Id: Icc58f7afb6c4c60c78d7963b44d2cbf7e93ba189
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2002618
Commit-Queue: Ehimare Okoyomon <eokoyomon@chromium.org>
Reviewed-by: Christian Dullweber <dullweber@chromium.org>
Reviewed-by: David Trainor <dtrainor@chromium.org>
Cr-Commit-Position: refs/heads/master@{#732781}

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

@@ -258,6 +258,7 @@ public abstract class ChromeFeatureList {
     public static final String HOMEPAGE_SETTINGS_UI_CONVERSION = "HomepageSettingsUIConversion";
     public static final String HORIZONTAL_TAB_SWITCHER_ANDROID = "HorizontalTabSwitcherAndroid";
     public static final String IMMERSIVE_UI_MODE = "ImmersiveUiMode";
+    public static final String IMPROVED_COOKIE_CONTROLS = "ImprovedCookieControls";
     public static final String IMPROVED_COOKIE_CONTROLS_FOR_THIRD_PARTY_COOKIE_BLOCKING =
             "ImprovedCookieControlsForThirdPartyCookieBlocking";
     public static final String INLINE_UPDATE_FLOW = "InlineUpdateFlow";

chrome/browser/about_flags.cc

@@ -4643,11 +4643,9 @@ const FeatureEntry kFeatureEntries[] = {
      FEATURE_VALUE_TYPE(
          password_manager::features::kEnablePasswordsAccountStorageSavingUi)},
 
-#if !defined(OS_ANDROID)
     {"improved-cookie-controls", flag_descriptions::kImprovedCookieControlsName,
-     flag_descriptions::kImprovedCookieControlsDescription, kOsDesktop,
+     flag_descriptions::kImprovedCookieControlsDescription, kOsAll,
      FEATURE_VALUE_TYPE(content_settings::kImprovedCookieControls)},
-#endif  // !defined(OS_ANDROID)
 
     {"improved-cookie-controls-for-third-party-cookie-blocking",
      flag_descriptions::kImprovedCookieControlsForThirdPartyCookieBlockingName,

chrome/browser/android/chrome_feature_list.cc

@@ -69,6 +69,7 @@ const base::Feature* kFeaturesExposedToJava[] = {
     &autofill_assistant::features::kAutofillAssistantChromeEntry,
     &autofill_assistant::features::kAutofillAssistantDirectActions,
     &autofill::features::kAutofillTouchToFill,
+    &content_settings::kImprovedCookieControls,
     &content_settings::kImprovedCookieControlsForThirdPartyCookieBlocking,
     &download::features::kDownloadAutoResumptionNative,
     &download::features::kUseDownloadOfflineContentProvider,

chrome/browser/flag_descriptions.cc

@@ -1236,6 +1236,11 @@ const char kIgnoreLitePageRedirectHintsBlacklistDescription[] =
     "Ignore blacklist decisions made by Optimization Hints for Lite Page "
     "Redirect previews";
 
+const char kImprovedCookieControlsName[] =
+    "Enable improved cookie controls UI in incognito mode";
+const char kImprovedCookieControlsDescription[] =
+    "Improved UI in Incognito mode for third-party cookie blocking.";
+
 const char kImprovedCookieControlsForThirdPartyCookieBlockingName[] =
     "Enable improved UI for third-party cookie blocking";
 const char kImprovedCookieControlsForThirdPartyCookieBlockingDescription[] =
@@ -2944,11 +2949,6 @@ const char kNtpWebUIName[] =
 const char kNtpWebUIDescription[] =
     "The WebUI new tab page is a replacement for the local NTP.";
 
-const char kImprovedCookieControlsName[] =
-    "Enable improved cookie controls UI in incognito mode";
-const char kImprovedCookieControlsDescription[] =
-    "Improved UI in Incognito mode for third-party cookie blocking.";
-
 const char kEnableReaderModeName[] = "Enable Reader Mode";
 const char kEnableReaderModeDescription[] =
     "Allows viewing of simplified web pages by selecting 'Customize and "

chrome/browser/flag_descriptions.h

@@ -745,6 +745,9 @@ extern const char kIgnorePreviewsBlacklistDescription[];
 extern const char kIgnoreLitePageRedirectHintsBlacklistName[];
 extern const char kIgnoreLitePageRedirectHintsBlacklistDescription[];
 
+extern const char kImprovedCookieControlsName[];
+extern const char kImprovedCookieControlsDescription[];
+
 extern const char kImprovedCookieControlsForThirdPartyCookieBlockingName[];
 extern const char
     kImprovedCookieControlsForThirdPartyCookieBlockingDescription[];
@@ -1733,9 +1736,6 @@ extern const char kNtpRealboxMatchOmniboxThemeDescription[];
 extern const char kNtpWebUIName[];
 extern const char kNtpWebUIDescription[];
 
-extern const char kImprovedCookieControlsName[];
-extern const char kImprovedCookieControlsDescription[];
-
 extern const char kEnableReaderModeName[];
 extern const char kEnableReaderModeDescription[];