Consent logic changes.

Two new experimental treatments:
1) tapping outside of the sheet or tapping back button are
not treated as consent rejections.
2) like above but there's a counter: first X taps are ignored, x+1th
is treated as rejection (X = 3 for now)

This cl also includes changes to feature and about flags (one
parametrized flag instead of two separate ones)

Bug: 1197255
Change-Id: Ia6122a707a75f5b3760e4365270818f7495aabc8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3022016
Commit-Queue: Basia Zimirska <[email protected]>
Reviewed-by: Filip Gorski <[email protected]>
Reviewed-by: Theresa  <[email protected]>
Reviewed-by: Brandon Wylie <[email protected]>
Cr-Commit-Position: refs/heads/master@{#905878}
diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
index ec234af..1ff27e6c 100644
--- a/chrome/browser/flag_descriptions.cc
+++ b/chrome/browser/flag_descriptions.cc
@@ -252,18 +252,11 @@
     "try to use a secure HTTPS connection to look up the addresses of websites "
     "and other web resources.";
 
-extern const char kAssistantExplicitVoiceConsentName[] =
-    "AssistantExplicitVoiceConsent";
-extern const char kAssistantExplicitVoiceConsentDescription[] =
-    "When enabled, backing off from the consent screen by tapping outside of "
-    "it or pressing the back button are not treated as rejection";
-
-extern const char kAssistantVoiceConstentTapsCounterName[] =
-    "AssistantVoiceConsentTapsCounter";
-extern const char kAssistantVoiceConstentTapsCounterDescription[] =
-    "When enabled, a specified (by a feature param) number of taps outside of "
-    "the consent screen or back button presses will be ignored, but the next "
-    "one will be treated as rejection";
+extern const char kAssistantConsentV2Name[] = "AssistanConsentV2";
+extern const char kAssistantConsentV2Description[] =
+    "Enables different strategies for handling backing off from the consent "
+    "screen without explicitly clicking yes/no buttons, i.e. when a user taps "
+    "outside of the sheet.";
 
 const char kAutofillAlwaysReturnCloudTokenizedCardName[] =
     "Return cloud token details for server credit cards when possible";