[iOS Enterprise] Mark completed policies as supported

Mark all policies that are ready and fully functional as "supported_on"
instead of "future_on" so they correctly show up as supported on iOS in
the Enterprise support pages.

Bug: 1153879
Change-Id: I08b9a166f257a71b44ea5f7345f5953e81ea7c5e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2566348
Commit-Queue: Guillaume Jenkins <gujen@google.com>
Reviewed-by: Rohit Rao <rohitrao@chromium.org>
Reviewed-by: Julian Pastarmov <pastarmovj@chromium.org>
Cr-Commit-Position: refs/heads/master@{#833380}

components/policy/resources/policy_templates.json

@@ -1364,8 +1364,8 @@
         'chrome.*:8-',
         'chrome_os:11-',
         'android:30-',
+        'ios:88-',
       ],
-      'future_on': [ 'ios' ],
       'features': {
         'can_be_recommended': True,
         'dynamic_refresh': True,
@@ -1787,8 +1787,8 @@
         'chrome.*:8-',
         'chrome_os:11-',
         'android:30-',
+        'ios:88-',
       ],
-      'future_on': [ 'ios' ],
       'features': {
         'dynamic_refresh': True,
         'per_profile': True,
@@ -2306,8 +2306,12 @@
       'owners': ['file://components/policy/resources/OWNERS'],
       'type': 'main',
       'schema': { 'type': 'boolean' },
-      'supported_on': ['chrome.*:8-', 'chrome_os:11-', 'android:39-'],
-      'future_on': [ 'ios' ],
+      'supported_on': [
+        'chrome.*:8-',
+        'chrome_os:11-',
+        'android:39-',
+        'ios:88-',
+      ],
       'features': {
         'dynamic_refresh': True,
         'per_profile': True,
@@ -3082,8 +3086,8 @@
         'chrome.*:8-',
         'chrome_os:11-',
         'android:30-',
+        'ios:88-',
       ],
-      'future_on': [ 'ios' ],
       'features': {
         'can_be_recommended': True,
         'dynamic_refresh': True,
@@ -3135,8 +3139,8 @@
         'chrome.*:83-',
         'chrome_os:83-',
         'android:87-',
+        'ios:88-',
       ],
-      'future_on': [ 'ios' ],
       'features': {
         'can_be_recommended': True,
         'dynamic_refresh': True,
@@ -3166,8 +3170,10 @@
       'owners': ['file://components/policy/resources/OWNERS'],
       'type': 'main',
       'schema': { 'type': 'boolean' },
-      'supported_on': ['chrome.*:8-'],
-      'future_on': [ 'ios' ],
+      'supported_on': [
+        'chrome.*:8-',
+        'ios:88-',
+      ],
       'features': {
         'can_be_recommended': True,
         'dynamic_refresh': False,
@@ -3194,8 +3200,8 @@
         'chrome.*:8-',
         'chrome_os:11-',
         'android:30-',
+        'ios:88-',
       ],
-      'future_on': [ 'ios' ],
       'features': {
         'can_be_recommended': True,
         'dynamic_refresh': True,
@@ -3297,8 +3303,8 @@
         'chrome.*:69-',
         'chrome_os:69-',
         'android:69-',
+        'ios:88-',
       ],
-      'future_on': [ 'ios' ],
       'features': {
         'can_be_recommended': True,
         'dynamic_refresh': True,
@@ -3321,8 +3327,8 @@
         'chrome.*:63-',
         'chrome_os:63-',
         'android:63-',
+        'ios:88-',
       ],
-      'future_on': [ 'ios' ],
       'features': {
         'can_be_recommended': True,
         'dynamic_refresh': True,
@@ -5102,8 +5108,8 @@
         'chrome.*:8-',
         'chrome_os:11-',
         'android:30-',
+        'ios:88-',
       ],
-      'future_on': [ 'ios' ],
       'features': {
         'dynamic_refresh': True,
         'per_profile': True,
@@ -5149,8 +5155,8 @@
         'chrome.*:8-',
         'chrome_os:11-',
         'android:30-',
+        'ios:88-',
       ],
-      'future_on': [ 'ios' ],
       'features': {
         'dynamic_refresh': True,
         'per_profile': True,
@@ -5172,8 +5178,8 @@
         'chrome.*:8-',
         'chrome_os:11-',
         'android:30-',
+        'ios:88-',
       ],
-      'future_on': [ 'ios' ],
       'features': {
         'dynamic_refresh': True,
         'per_profile': True,
@@ -5195,8 +5201,8 @@
         'chrome.*:8-',
         'chrome_os:11-',
         'android:30-',
+        'ios:88-',
       ],
-      'future_on': [ 'ios' ],
       'features': {
         'dynamic_refresh': True,
         'per_profile': True,
@@ -5218,8 +5224,8 @@
         'chrome.*:8-',
         'chrome_os:11-',
         'android:30-',
+        'ios:88-',
       ],
-      'future_on': [ 'ios' ],
       'features': {
         'dynamic_refresh': True,
         'per_profile': True,
@@ -5264,8 +5270,8 @@
         'chrome.*:8-',
         'chrome_os:11-',
         'android:30-',
+        'ios:88-',
       ],
-      'future_on': [ 'ios' ],
       'features': {
         'dynamic_refresh': True,
         'per_profile': True,
@@ -5290,8 +5296,8 @@
         'chrome.*:8-',
         'chrome_os:11-',
         'android:30-',
+        'ios:88-',
       ],
-      'future_on': [ 'ios' ],
       'features': {
         'dynamic_refresh': True,
         'per_profile': True,
@@ -5316,8 +5322,8 @@
         'chrome.*:24-',
         'chrome_os:24-',
         'android:30-',
+        'ios:88-',
       ],
-      'future_on': [ 'ios' ],
       'features': {
         'dynamic_refresh': True,
         'per_profile': True,
@@ -5360,8 +5366,8 @@
         'chrome.*:29-',
         'chrome_os:29-',
         'android:30-',
+        'ios:88-',
       ],
-      'future_on': [ 'ios' ],
       'features': {
         'dynamic_refresh': True,
         'per_profile': True,
@@ -5383,8 +5389,8 @@
         'chrome.*:30-',
         'chrome_os:30-',
         'android:30-',
+        'ios:88-',
       ],
-      'future_on': [ 'ios' ],
       'features': {
         'dynamic_refresh': True,
         'per_profile': True,
@@ -5406,8 +5412,8 @@
         'chrome.*:29-',
         'chrome_os:29-',
         'android:30-',
+        'ios:88-',
       ],
-      'future_on': [ 'ios' ],
       'features': {
         'dynamic_refresh': True,
         'per_profile': True,
@@ -5429,8 +5435,8 @@
         'chrome.*:29-',
         'chrome_os:29-',
         'android:30-',
+        'ios:88-',
       ],
-      'future_on': [ 'ios' ],
       'features': {
         'dynamic_refresh': True,
         'per_profile': True,
@@ -5473,8 +5479,8 @@
         'chrome.*:29-',
         'chrome_os:29-',
         'android:30-',
+        'ios:88-',
       ],
-      'future_on': [ 'ios' ],
       'features': {
         'dynamic_refresh': True,
         'per_profile': True,
@@ -5664,8 +5670,8 @@
         'chrome.*:10-',
         'chrome_os:11-',
         'android:33-',
+        'ios:88-',
       ],
-      'future_on': [ 'ios' ],
       'features': {
         'dynamic_refresh': True,
         'per_profile': True,
@@ -6874,8 +6880,8 @@
         'chrome.*:11-',
         'chrome_os:11-',
         'android:34-',
+        'ios:88-',
       ],
-      'future_on': [ 'ios' ],
       'features': {
         'dynamic_refresh': True,
         'per_profile': True,
@@ -6943,8 +6949,8 @@
         'chrome.*:11-',
         'chrome_os:11-',
         'android:34-',
+        'ios:88-',
       ],
-      'future_on': [ 'ios' ],
       'features': {
         'dynamic_refresh': True,
         'per_profile': True,
@@ -7637,8 +7643,8 @@
         'chrome.*:12-',
         'chrome_os:12-',
         'android:30-',
+        'ios:88-',
       ],
-      'future_on': [ 'ios' ],
       'features': {
         'can_be_recommended': True,
         'dynamic_refresh': True,
@@ -7738,8 +7744,8 @@
         'chrome.*:12-',
         'chrome_os:12-',
         'android:30-',
+        'ios:88-',
       ],
-      'future_on': [ 'ios' ],
       'features': {
         'dynamic_refresh': True,
         'per_profile': True,
@@ -10386,9 +10392,9 @@
       'supported_on': [
         'chrome.*:22-',
         'chrome_os:22-',
-        'android:30-'
+        'android:30-',
+        'ios:88-',
       ],
-      'future_on': ['ios'],
       'features': {
         'dynamic_refresh': True,
         'per_profile': True,
@@ -13260,8 +13266,10 @@
           'caption': '''Disable all variations''',
         },
       ],
-      'supported_on': ['chrome.*:83-'],
-      'future_on': ['ios'],
+      'supported_on': [
+        'chrome.*:83-',
+        'ios:88-',
+      ],
       'features': {
         'dynamic_refresh': True,
         'per_profile': False,
@@ -13531,8 +13539,8 @@
         'android:30-',
         'chrome.*:37-',
         'chrome_os:37-',
+        'ios:88-',
       ],
-      'future_on': [ 'ios' ],
       'features': {
         'dynamic_refresh': True,
         'per_profile': True,
@@ -17144,8 +17152,10 @@
       'owners': ['zmin@chromium.org', 'pastarmovj@chromium.org'],
       'type': 'main',
       'schema': { 'type': 'boolean'},
-      'supported_on': ['chrome.*:75-'],
-      'future_on': ['ios'],
+      'supported_on': [
+        'chrome.*:75-',
+        'ios:88-',
+      ],
       'features': {
         'dynamic_refresh': False,
         'per_profile': False,
@@ -18228,8 +18238,10 @@
       'owners': ['zmin@chromium.org', 'pastarmovj@chromium.org', 'rogerta@chromium.org'],
       'type': 'string',
       'schema': { 'type': 'string' },
-      'supported_on': ['chrome.*:72-'],
-      'future_on': [ 'ios' ],
+      'supported_on': [
+        'chrome.*:72-',
+        'ios:88-',
+      ],
       'features': {
         'dynamic_refresh': False,
         'per_profile': False,
@@ -19431,8 +19443,11 @@
         'per_profile': False,
         'cloud_only': True,
       },
-      'supported_on': ['chrome.*:72-', 'chrome_os:81-'],
-      'future_on': [ 'ios' ],
+      'supported_on': [
+        'chrome.*:72-',
+        'chrome_os:81-',
+        'ios:88-',
+      ],
       'caption': '''Enables <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> cloud reporting''',
       'example_value': True,
       'desc': '''This policy controls <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> cloud reporting which uploads information about the browser operation to Google Admin console.

ios/chrome/browser/chrome_switches.cc

@@ -39,10 +39,6 @@ const char kEnableSpotlightActions[] = "enable-spotlight-actions";
 const char kEnableThirdPartyKeyboardWorkaround[] =
     "enable-third-party-keyboard-workaround";
 
-// Installs the managed bookmarks policy handler.
-const char kInstallManagedBookmarksHandler[] =
-    "install-managed-bookmarks-handler";
-
 // Installs the URLBlocklist and URLAllowlist handlers.
 const char kInstallURLBlocklistHandlers[] = "install-url-blocklist-handlers";
 

ios/chrome/browser/chrome_switches.h

@@ -17,7 +17,6 @@ extern const char kEnableEnterprisePolicy[];
 extern const char kEnableIOSHandoffToOtherDevices[];
 extern const char kEnableSpotlightActions[];
 extern const char kEnableThirdPartyKeyboardWorkaround[];
-extern const char kInstallManagedBookmarksHandler[];
 extern const char kInstallURLBlocklistHandlers[];
 
 extern const char kUserAgent[];

ios/chrome/browser/policy/configuration_policy_handler_list_factory.mm

@@ -126,12 +126,9 @@ std::unique_ptr<policy::ConfigurationPolicyHandlerList> BuildPolicyHandlerList(
   handlers->AddHandler(std::make_unique<policy::DefaultSearchPolicyHandler>());
   handlers->AddHandler(
       std::make_unique<safe_browsing::SafeBrowsingPolicyHandler>());
-
-  if (ShouldInstallManagedBookmarksPolicyHandler()) {
   handlers->AddHandler(
       std::make_unique<bookmarks::ManagedBookmarksPolicyHandler>(
           chrome_schema));
-  }
 
   if (ShouldInstallURLBlocklistPolicyHandlers()) {
     handlers->AddHandler(std::make_unique<policy::URLBlocklistPolicyHandler>(

ios/chrome/browser/policy/policy_features.cc

@@ -13,10 +13,10 @@
 #include "ios/web/common/features.h"
 
 const base::Feature kEditBookmarksIOS{"EditBookmarksIOS",
-                                      base::FEATURE_DISABLED_BY_DEFAULT};
+                                      base::FEATURE_ENABLED_BY_DEFAULT};
 
 const base::Feature kManagedBookmarksIOS{"ManagedBookmarksIOS",
-                                         base::FEATURE_DISABLED_BY_DEFAULT};
+                                         base::FEATURE_ENABLED_BY_DEFAULT};
 
 const base::Feature kEnableIncognitoModeAvailabilityIOS{
     "EnableIncognitoModeAvailabilityIOS", base::FEATURE_DISABLED_BY_DEFAULT};
@@ -59,13 +59,8 @@ bool ShouldInstallEnterprisePolicyHandlers() {
   return IsEnterprisePolicyEnabled();
 }
 
-bool ShouldInstallManagedBookmarksPolicyHandler() {
-  return HasSwitch(switches::kInstallManagedBookmarksHandler);
-}
-
 bool IsManagedBookmarksEnabled() {
-  return ShouldInstallManagedBookmarksPolicyHandler() &&
-         base::FeatureList::IsEnabled(kManagedBookmarksIOS);
+  return base::FeatureList::IsEnabled(kManagedBookmarksIOS);
 }
 
 bool ShouldInstallURLBlocklistPolicyHandlers() {

ios/chrome/browser/ui/bookmarks/managed_bookmarks_egtest.mm

@@ -38,10 +38,6 @@ AppLaunchConfiguration GenerateAppLaunchConfiguration(std::string policy_data) {
   AppLaunchConfiguration config;
   config.additional_args.push_back(std::string("--") +
                                    switches::kEnableEnterprisePolicy);
-  config.additional_args.push_back(std::string("--") +
-                                   switches::kInstallManagedBookmarksHandler);
-  config.additional_args.push_back(
-      std::string("--enable-features=ManagedBookmarksIOS"));
 
   // Remove whitespace from the policy data, because the XML parser does not
   // tolerate newlines.

ios/chrome/browser/ui/popup_menu/popup_menu_mediator_unittest.mm

@@ -409,6 +409,7 @@ TEST_F(PopupMenuMediatorTest, TestItemsStatusOnNTP) {
 TEST_F(PopupMenuMediatorTest, TestReadLaterDisabled) {
   const GURL kUrl("https://chromium.test");
   web_state_->SetCurrentURL(kUrl);
+  CreatePrefs();
   CreateMediator(PopupMenuTypeToolsMenu, /*is_incognito=*/NO,
                  /*trigger_incognito_hint=*/NO);
   mediator_.webStateList = web_state_list_.get();
@@ -416,6 +417,7 @@ TEST_F(PopupMenuMediatorTest, TestReadLaterDisabled) {
       browser_.get(), OverlayModality::kWebContentArea);
   FakePopupMenuConsumer* consumer = [[FakePopupMenuConsumer alloc] init];
   mediator_.popupMenu = consumer;
+  mediator_.prefService = prefs_.get();
   SetUpActiveWebState();
   ASSERT_TRUE(HasItem(consumer, kToolsMenuReadLater, /*enabled=*/YES));
 
@@ -512,12 +514,14 @@ TEST_F(PopupMenuMediatorTest, TestBookmarksToolsMenuButtons) {
   web_state_->SetCurrentURL(url);
   CreateMediator(PopupMenuTypeToolsMenu, /*is_incognito=*/NO,
                  /*trigger_incognito_hint=*/NO);
+  CreatePrefs();
   SetUpBookmarks();
   bookmarks::AddIfNotBookmarked(bookmark_model_, url,
                                 base::SysNSStringToUTF16(@"Test bookmark"));
   mediator_.webStateList = web_state_list_.get();
   FakePopupMenuConsumer* consumer = [[FakePopupMenuConsumer alloc] init];
   mediator_.popupMenu = consumer;
+  mediator_.prefService = prefs_.get();
 
   EXPECT_TRUE(HasItem(consumer, kToolsMenuAddToBookmarks, /*enabled=*/YES));