Add flag for improved cookie controls

Bug: 967668
Change-Id: I7c87919cc901d0e7253a49df510fe4cfc930ce30
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1776044
Commit-Queue: Christian Dullweber <dullweber@chromium.org>
Reviewed-by: Ramin Halavati <rhalavati@chromium.org>
Cr-Commit-Position: refs/heads/master@{#691614}

chrome/browser/about_flags.cc

@@ -59,6 +59,7 @@
 #include "components/autofill_assistant/browser/features.h"
 #include "components/browser_sync/browser_sync_switches.h"
 #include "components/cloud_devices/common/cloud_devices_switches.h"
+#include "components/content_settings/core/common/features.h"
 #include "components/contextual_search/core/browser/public.h"
 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_features.h"
 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_switches.h"
@@ -4470,6 +4471,13 @@ const FeatureEntry kFeatureEntries[] = {
      FEATURE_VALUE_TYPE(
          password_manager::features::kEnablePasswordsAccountStorage)},
 
+#if !defined(OS_ANDROID)
+    {"improved-cookie-controls",
+     flag_descriptions::kEnableImprovedCookieControlsName,
+     flag_descriptions::kEnableImprovedCookieControlsDescription, kOsDesktop,
+     FEATURE_VALUE_TYPE(content_settings::kImprovedCookieControls)},
+#endif  // !defined(OS_ANDROID)
+
     // 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/flag-metadata.json

@@ -2246,6 +2246,11 @@
     // testing and should not be removed.
     "expiry_milestone": -1
   },
+  {
+    "name": "improved-cookie-controls",
+    "owners": [ "dullweber", "huanzhong" ],
+    "expiry_milestone": 84
+  },
   {
     "name": "in-product-help-demo-mode-choice",
     "owners": [ "dtrainor", "nyquist" ],

chrome/browser/flag_descriptions.cc

@@ -2804,6 +2804,12 @@ const char kNtpZeroSuggestDescription[] =
     "If enabled, forces on \"Real search box in New Tab Page\" and suggests "
     "results without any typed input (i.e. on focus).";
 
+const char kEnableImprovedCookieControlsName[] =
+    "Enable improved cookie controls UI";
+const char kEnableImprovedCookieControlsDescription[] =
+    "Enables third-party cookie blocking and an improved cookie controls UI in "
+    "incognito mode.";
+
 const char kEnableReaderModeName[] = "Enable Reader Mode";
 const char kEnableReaderModeDescription[] =
     "Allows viewing of simplified web pages by selecting 'Customize and "

chrome/browser/flag_descriptions.h

@@ -1658,6 +1658,9 @@ extern const char kNtpRealboxDescription[];
 extern const char kNtpZeroSuggestName[];
 extern const char kNtpZeroSuggestDescription[];
 
+extern const char kEnableImprovedCookieControlsName[];
+extern const char kEnableImprovedCookieControlsDescription[];
+
 extern const char kEnableReaderModeName[];
 extern const char kEnableReaderModeDescription[];
 

tools/metrics/histograms/enums.xml

@@ -36359,6 +36359,7 @@ from previous Chrome versions.
   <int value="575829120" label="shelf-hotseat"/>
   <int value="576701073" label="WebPaymentsJustInTimePaymentApp:disabled"/>
   <int value="576878329" label="enable-background-blur"/>
+  <int value="578695119" label="ImprovedCookieControls:disabled"/>
   <int value="581118445" label="enable-eol-notification"/>
   <int value="581355159" label="ContentSuggestionsCategoryRanker:disabled"/>
   <int value="582187448" label="DontPrefetchLibraries:enabled"/>
@@ -36711,6 +36712,7 @@ from previous Chrome versions.
   <int value="1070840417" label="ChromeColors:enabled"/>
   <int value="1071520357" label="WebAuthenticationTouchId:enabled"/>
   <int value="1072010558" label="NTPModernLayout:disabled"/>
+  <int value="1072517479" label="ImprovedCookieControls:enabled"/>
   <int value="1074359194" label="UseSuggestionsEvenIfFew:enabled"/>
   <int value="1074427701" label="NewPrintPreviewLayout:enabled"/>
   <int value="1075637651" label="disable-tablet-splitview"/>