[ios]🏢 Remove enableIncognitoModeAvailabilityMode feature flag

Remove enableIncognitoModeAvailabilityMode feature flag because: 1. The policy is fully launched on M90. 2. This enterprise policy is will only be used by trusted testers. (cherry picked from commit 0d8414b) Bug: 1197297 Change-Id: I12fec12dd8f4e7d3a544e17b0abe9835de135b1d Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2816201 Reviewed-by: sebsg <sebsg@chromium.org> Reviewed-by: Sergio Collazos <sczs@chromium.org> Commit-Queue: Tina Wang <tinazwang@chromium.org> Cr-Original-Commit-Position: refs/heads/master@{#872026} Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2824017 Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> Cr-Commit-Position: refs/branch-heads/4472@{#50} Cr-Branched-From: 3d60439-refs/heads/master@{#870763}
chromium · Apr 14, 2021 · 3b81d7e · 3b81d7e
1 parent a10cf4b
commit 3b81d7e
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 35 deletions.
diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json
@@ -1927,11 +1927,6 @@
     "owners": [ "stkhapugin", "bling-flags@google.com" ],
     "expiry_milestone": 90
   },
-  {
-    "name": "enable-incognito-mode-availability-ios",
-    "owners": [ "tinazwang", "sebsg" ],
-    "expiry_milestone": 92
-  },
   {
     "name": "enable-incognito-shortcut-on-desktop",
     "owners": [ "rhalavati", "chrome-privacy-core@google.com" ],

diff --git a/ios/chrome/browser/flags/about_flags.mm b/ios/chrome/browser/flags/about_flags.mm
@@ -598,10 +598,6 @@
      flag_descriptions::kIncognitoAuthenticationName,
      flag_descriptions::kIncognitoAuthenticationDescription, flags_ui::kOsIos,
      FEATURE_VALUE_TYPE(kIncognitoAuthentication)},
-    {"enable-incognito-mode-availability-ios",
-     flag_descriptions::kEnableIncognitoModeAvailabilityIOSName,
-     flag_descriptions::kEnableIncognitoModeAvailabilityIOSDescription,
-     flags_ui::kOsIos, FEATURE_VALUE_TYPE(kEnableIncognitoModeAvailabilityIOS)},
     {"web-view-native-context-menu",
      flag_descriptions::kWebViewNativeContextMenuName,
      flag_descriptions::kWebViewNativeContextMenuDescription, flags_ui::kOsIos,

diff --git a/ios/chrome/browser/flags/ios_chrome_flag_descriptions.cc b/ios/chrome/browser/flags/ios_chrome_flag_descriptions.cc
@@ -198,12 +198,6 @@ const char kEnableFullPageScreenshotDescription[] =
     "Enables the option of capturing an entire webpage as a PDF when a "
     "screenshot is taken.";
 
-const char kEnableIncognitoModeAvailabilityIOSName[] =
-    "Enable Incognito Mode Management on IOS ";
-const char kEnableIncognitoModeAvailabilityIOSDescription[] =
-    "Enable the corresponding behaviours and UIs when incognito mode is "
-    "managed by the organization.";
-
 const char kEnableIOSManagedSettingsUIName[] = "Enable IOS Managed Settings UI";
 const char kEnableIOSManagedSettingsUIDescription[] =
     "Enable showing a different UI when the setting is managed by an "

diff --git a/ios/chrome/browser/flags/ios_chrome_flag_descriptions.h b/ios/chrome/browser/flags/ios_chrome_flag_descriptions.h
@@ -174,10 +174,6 @@ extern const char kEnableFREUIModuleIOSDescription[];
 extern const char kEnableFullPageScreenshotName[];
 extern const char kEnableFullPageScreenshotDescription[];
 
-// Title and description for the flag to enable incognito mode management.
-extern const char kEnableIncognitoModeAvailabilityIOSName[];
-extern const char kEnableIncognitoModeAvailabilityIOSDescription[];
-
 // Title and description for the flag to enable to show a different UI when the
 // setting is managed by an enterprise policy.
 extern const char kEnableIOSManagedSettingsUIName[];

diff --git a/ios/chrome/browser/policy/policy_features.cc b/ios/chrome/browser/policy/policy_features.cc
@@ -12,9 +12,6 @@
 #include "ios/chrome/common/channel_info.h"
 #include "ios/web/common/features.h"
 
-const base::Feature kEnableIncognitoModeAvailabilityIOS{
-    "EnableIncognitoModeAvailabilityIOS", base::FEATURE_ENABLED_BY_DEFAULT};
-
 const base::Feature kURLBlocklistIOS{"URLBlocklistIOS",
                                      base::FEATURE_DISABLED_BY_DEFAULT};
 
@@ -41,10 +38,6 @@ bool IsEnterprisePolicyEnabled() {
   return !IsDisableEnterprisePolicySwitchPresent();
 }
 
-bool IsIncognitoModeAvailable() {
-  return base::FeatureList::IsEnabled(kEnableIncognitoModeAvailabilityIOS);
-}
-
 bool ShouldInstallEnterprisePolicyHandlers() {
   return IsEnterprisePolicyEnabled();
 }

diff --git a/ios/chrome/browser/policy/policy_features.h b/ios/chrome/browser/policy/policy_features.h
@@ -10,11 +10,6 @@
 // Feature flag for supporting the URLBlocklist enterprise policy on iOS.
 extern const base::Feature kURLBlocklistIOS;
 
-// Feature flag for supporting the IncognitoModeAvailability enterprise policy
-// on iOS. To define if the flag is set, using the helper method
-// IsIncognitoModeAvailable().
-extern const base::Feature kEnableIncognitoModeAvailabilityIOS;
-
 // Returns true if the Chrome Browser Cloud Management flow is enabled.
 bool IsChromeBrowserCloudManagementEnabled();
 
@@ -23,10 +18,6 @@ bool IsChromeBrowserCloudManagementEnabled();
 // controlled by |ShouldInstallEnterprisePolicyHandlers()| below.
 bool IsEnterprisePolicyEnabled();
 
-// Returns true if IncognitoModeAvailability enterprise policy is supported on
-// iOS.
-bool IsIncognitoModeAvailable();
-
 // Returns true if enterprise policy handlers should be installed to parse
 // policy data and make it user visible.
 bool ShouldInstallEnterprisePolicyHandlers();