flags: remove modal-permission-prompts

This change removes the flag, and annotates the underlying feature with a TODO
to remove it.

Bug: 935900
Change-Id: I99c581031a1e24f94a66bcd76bc48dde45c053a5
Reviewed-on: https://chromium-review.googlesource.com/c/1489171
Auto-Submit: Elly Fong-Jones <ellyjones@chromium.org>
Commit-Queue: Balazs Engedy <engedy@chromium.org>
Reviewed-by: Balazs Engedy <engedy@chromium.org>
Cr-Commit-Position: refs/heads/master@{#635528}

chrome/browser/about_flags.cc

@@ -2592,11 +2592,6 @@ const FeatureEntry kFeatureEntries[] = {
      flag_descriptions::kExpensiveBackgroundTimerThrottlingName,
      flag_descriptions::kExpensiveBackgroundTimerThrottlingDescription, kOsAll,
      FEATURE_VALUE_TYPE(features::kExpensiveBackgroundTimerThrottling)},
-#if defined(OS_ANDROID)
-    {"modal-permission-prompts", flag_descriptions::kModalPermissionPromptsName,
-     flag_descriptions::kModalPermissionPromptsDescription, kOsAndroid,
-     FEATURE_VALUE_TYPE(features::kModalPermissionPrompts)},
-#endif
 #if BUILDFLAG(ENABLE_PRINT_PREVIEW)
     {"enable-nup-printing", flag_descriptions::kEnableNupPrintingName,
      flag_descriptions::kEnableNupPrintingDescription, kOsAll,

chrome/browser/flag-metadata.json

@@ -2326,11 +2326,6 @@
     "owners": [ "bsazonov", "droger", "msarda" ],
     "expiry_milestone": 80
   },
-  {
-    "name": "modal-permission-prompts",
-    // "owners": [ "your-team" ],
-    "expiry_milestone": 76
-  },
   {
     "name": "network-service",
     // "owners": [ "your-team" ],

chrome/browser/flag_descriptions.cc

@@ -2451,10 +2451,6 @@ const char kModalPermissionDialogViewName[] = "Modal Permission Dialog";
 const char kModalPermissionDialogViewDescription[] =
     "Enable this option to use ModalDialogManager for permission Dialogs.";
 
-const char kModalPermissionPromptsName[] = "Modal Permission Prompts";
-const char kModalPermissionPromptsDescription[] =
-    "Whether to use permission dialogs in place of permission infobars.";
-
 const char kNewContactsPickerName[] = "Enable new contacts picker";
 const char kNewContactsPickerDescription[] =
     "Activates the new picker for selecting contacts.";

chrome/browser/flag_descriptions.h

@@ -1450,9 +1450,6 @@ extern const char kMediaScreenCaptureDescription[];
 extern const char kModalPermissionDialogViewName[];
 extern const char kModalPermissionDialogViewDescription[];
 
-extern const char kModalPermissionPromptsName[];
-extern const char kModalPermissionPromptsDescription[];
-
 extern const char kNewContactsPickerName[];
 extern const char kNewContactsPickerDescription[];
 

chrome/common/chrome_features.cc

@@ -382,6 +382,7 @@ const base::Feature kAcknowledgeNtpOverrideOnDeactivate{
 #endif
 
 // Enables or disables modal permission prompts.
+// TODO(https://crbug.com/935900): Remove this.
 const base::Feature kModalPermissionPrompts{"ModalPermissionPrompts",
                                             base::FEATURE_ENABLED_BY_DEFAULT};