[Spaces]: Move some of the features behind kProfilesUiRevamp.

This CL moves some of the features behind 'kProfilesUiRevamp' to either
'kNewProfilePicker' or 'kDiceWebSigninInterceptionFeature' feature
flags.

Fixed: 1151943
Change-Id: I00dee6bc2085d757da90522f731569a8898b7a35
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2555059
Commit-Queue: Monica Basta <msalama@chromium.org>
Auto-Submit: Monica Basta <msalama@chromium.org>
Reviewed-by: David Roger <droger@chromium.org>
Cr-Commit-Position: refs/heads/master@{#830537}

chrome/browser/password_manager/password_manager_signin_intercept_test_helper.cc

@@ -43,9 +43,7 @@ PasswordManagerSigninInterceptTestHelper::
     PasswordManagerSigninInterceptTestHelper(
         net::test_server::EmbeddedTestServer* https_test_server)
     : https_test_server_(https_test_server) {
-  feature_list_.InitWithFeatures(
-      {kDiceWebSigninInterceptionFeature, ::features::kProfilesUIRevamp},
-      /*disabled_features=*/{});
+  feature_list_.InitAndEnableFeature(kDiceWebSigninInterceptionFeature);
 }
 
 PasswordManagerSigninInterceptTestHelper::

chrome/browser/resources/settings/people_page/manage_profile.html

@@ -56,7 +56,7 @@
         padding: var(--cr-section-vertical-padding) 0;
       }
     </style>
-    <template is="dom-if" if="[[!isProfilesUIRevamp_]]">
+    <template is="dom-if" if="[[!isNewProfilePicker_]]">
       <div class="cr-row first">
         <cr-input id="name" value="[[profileName]]" pattern="[[pattern_]]"
             on-change="onProfileNameChanged_" on-keydown="onProfileNameKeydown_"
@@ -83,7 +83,7 @@
       </cr-profile-avatar-selector>
   </template>
 
-  <template is="dom-if" if="[[isProfilesUIRevamp_]]">
+  <template is="dom-if" if="[[isNewProfilePicker_]]">
     <div class="cr-row first manage-profile-section">
       <h1 class="cr-title-text">$i18n{nameYourProfile}</h1>
       <div class="content">

chrome/browser/resources/settings/people_page/manage_profile.js

@@ -78,12 +78,12 @@ Polymer({
     isProfileShortcutSettingVisible_: Boolean,
 
     /**
-     * True if the 'kProfilesUIRevamp' feature is enabled.
+     * True if the 'kNewProfilePicker' feature is enabled.
      * @private
      */
-    isProfilesUIRevamp_: {
+    isNewProfilePicker_: {
       type: Boolean,
-      value: () => loadTimeData.getBoolean('profilesUIRevamp')
+      value: () => loadTimeData.getBoolean('newProfilePicker')
     },
 
     /**

chrome/browser/ui/views/profiles/dice_web_signin_interception_bubble_view.cc

@@ -166,17 +166,6 @@ void DiceWebSigninInterceptorDelegate::ShowSigninInterceptionBubbleInternal(
     base::OnceCallback<void(SigninInterceptionResult)> callback) {
   DCHECK(browser);
 
-  if (bubble_parameters.interception_type ==
-          DiceWebSigninInterceptor::SigninInterceptionType::kProfileSwitch &&
-      !base::FeatureList::IsEnabled(features::kProfilesUIRevamp)) {
-    // The bubble for profile switch is not enabled.
-    DiceWebSigninInterceptionBubbleView::RecordInterceptionResult(
-        bubble_parameters, browser->profile(),
-        SigninInterceptionResult::kNotDisplayed);
-    std::move(callback).Run(SigninInterceptionResult::kNotDisplayed);
-    return;
-  }
-
   views::View* anchor_view = BrowserView::GetBrowserViewForBrowser(browser)
                                  ->toolbar_button_provider()
                                  ->GetAvatarToolbarButton();

chrome/browser/ui/views/profiles/profile_customization_bubble_view.cc

@@ -75,9 +75,6 @@ void DiceWebSigninInterceptorDelegate::ShowProfileCustomizationBubbleInternal(
     Browser* browser) {
   DCHECK(browser);
 
-  if (!base::FeatureList::IsEnabled(features::kProfilesUIRevamp))
-    return;
-
   views::View* anchor_view = BrowserView::GetBrowserViewForBrowser(browser)
                                  ->toolbar_button_provider()
                                  ->GetAvatarToolbarButton();

chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc

@@ -1241,7 +1241,7 @@ void AddPeopleStrings(content::WebUIDataSource* html_source, Profile* profile) {
                           ProfileShortcutManager::IsFeatureEnabled());
 #if !BUILDFLAG(IS_CHROMEOS_ASH)
   html_source->AddLocalizedString(
-      "editPerson", base::FeatureList::IsEnabled(features::kProfilesUIRevamp)
+      "editPerson", base::FeatureList::IsEnabled(features::kNewProfilePicker)
                         ? IDS_SETTINGS_CUSTOMIZE_PROFILE
                         : IDS_SETTINGS_EDIT_PERSON);
 #endif

chrome/browser/ui/webui/settings/settings_manage_profile_handler.cc

@@ -150,8 +150,7 @@ std::unique_ptr<base::ListValue> ManageProfileHandler::GetAvailableIcons() {
       profiles::GetCustomProfileAvatarIconsAndLabels(selected_avatar_idx));
 
   if (entry->GetSigninState() == SigninState::kNotSignedIn) {
-    if (base::FeatureList::IsEnabled(features::kNewProfilePicker) &&
-        base::FeatureList::IsEnabled(features::kProfilesUIRevamp)) {
+    if (base::FeatureList::IsEnabled(features::kNewProfilePicker)) {
       ProfileThemeColors colors = entry->GetProfileThemeColors();
       auto generic_avatar_info = profiles::GetDefaultProfileAvatarIconAndLabel(
           colors.default_avatar_fill_color, colors.default_avatar_stroke_color,

chrome/browser/ui/webui/settings/settings_manage_profile_handler_unittest.cc

@@ -291,8 +291,7 @@ TEST_F(ManageProfileHandlerTest, GetAvailableIconsSignedInProfile) {
 
 TEST_F(ManageProfileHandlerTest, GetAvailableIconsLocalProfile) {
   base::test::ScopedFeatureList scoped_feature_list;
-  scoped_feature_list.InitWithFeatures(
-      {features::kNewProfilePicker, features::kProfilesUIRevamp}, {});
+  scoped_feature_list.InitAndEnableFeature(features::kNewProfilePicker);
   EXPECT_FALSE(entry()->IsUsingGAIAPicture());
   EXPECT_EQ(entry()->GetAvatarIconIndex(),
             profiles::GetPlaceholderAvatarIndex());
@@ -341,8 +340,7 @@ TEST_F(ManageProfileHandlerTest, ProfileAvatarChangedWebUIEvent) {
 
 TEST_F(ManageProfileHandlerTest, ProfileThemeColorsChangedWebUIEvent) {
   base::test::ScopedFeatureList scoped_feature_list;
-  scoped_feature_list.InitWithFeatures(
-      {features::kNewProfilePicker, features::kProfilesUIRevamp}, {});
+  scoped_feature_list.InitAndEnableFeature(features::kNewProfilePicker);
   ProfileThemeColors colors = {SK_ColorTRANSPARENT, SK_ColorBLACK,
                                SK_ColorWHITE};
   entry()->SetProfileThemeColors(colors);

chrome/browser/ui/webui/settings/settings_ui.cc

@@ -309,8 +309,8 @@ SettingsUI::SettingsUI(content::WebUI* web_ui)
   // This is the browser settings page.
   html_source->AddBoolean("isOSSettings", false);
 #else   // BUILDFLAG(IS_CHROMEOS_ASH)
-  html_source->AddBoolean("profilesUIRevamp", base::FeatureList::IsEnabled(
-                                                  features::kProfilesUIRevamp));
+  html_source->AddBoolean("newProfilePicker", base::FeatureList::IsEnabled(
+                                                  features::kNewProfilePicker));
 #endif  // !BUILDFLAG(IS_CHROMEOS_ASH)
 
   AddSettingsPageUIHandler(std::make_unique<AboutHandler>(profile));

chrome/test/data/webui/settings/people_page_manage_profile_test.js

@@ -80,7 +80,7 @@ suite('ManageProfileTests', function() {
   setup(function() {
     browserProxy = new TestManageProfileBrowserProxy();
     ManageProfileBrowserProxyImpl.instance_ = browserProxy;
-    setFlags({profilesUIRevamp: false, profileShortcutsEnabled: false});
+    setFlags({newProfilePicker: false, profileShortcutsEnabled: false});
     Router.getInstance().navigateTo(routes.MANAGE_PROFILE);
   });
 
@@ -137,7 +137,7 @@ suite('ManageProfileTests', function() {
     }
     await changeIcon();
     browserProxy.reset();
-    setFlags({profilesUIRevamp: true});
+    setFlags({newProfilePicker: true});
     await changeIcon();
   });
 
@@ -158,7 +158,7 @@ suite('ManageProfileTests', function() {
     }
     await changeName();
     browserProxy.resetResolver('setProfileName');
-    setFlags({profilesUIRevamp: true});
+    setFlags({newProfilePicker: true});
     await changeName();
   });
 
@@ -173,7 +173,7 @@ suite('ManageProfileTests', function() {
       assertTrue(!!nameField.disabled);
     }
     profileNameDisabledForSupervisedUser();
-    setFlags({profilesUIRevamp: true});
+    setFlags({newProfilePicker: true});
     profileNameDisabledForSupervisedUser();
   });
 
@@ -192,7 +192,7 @@ suite('ManageProfileTests', function() {
     }
     await profileNameUpdated();
     browserProxy.resetResolver('getAvailableIcons');
-    setFlags({profilesUIRevamp: true});
+    setFlags({newProfilePicker: true});
     await profileNameUpdated();
   });
 
@@ -210,7 +210,7 @@ suite('ManageProfileTests', function() {
     assertFalse(!!manageProfile.$$('#themeSelector'));
 
     // Recreate a manage profile element with overridden loadTimeData.
-    setFlags({profilesUIRevamp: true});
+    setFlags({newProfilePicker: true});
 
     assertTrue(!!manageProfile.$$('#themeSelector'));
   });
@@ -243,10 +243,10 @@ suite('ManageProfileTests', function() {
       hasShortcutToggle.click();
       return browserProxy.whenCalled('addProfileShortcut');
     }
-    setFlags({profilesUIRevamp: false, profileShortcutsEnabled: true});
+    setFlags({newProfilePicker: false, profileShortcutsEnabled: true});
     await profileShortcutToggle();
     browserProxy.reset();
-    setFlags({profilesUIRevamp: true, profileShortcutsEnabled: true});
+    setFlags({newProfilePicker: true, profileShortcutsEnabled: true});
     await profileShortcutToggle();
   });
 
@@ -267,10 +267,10 @@ suite('ManageProfileTests', function() {
 
       assertFalse(hasShortcutToggle.checked);
     }
-    setFlags({profilesUIRevamp: false, profileShortcutsEnabled: true});
+    setFlags({newProfilePicker: false, profileShortcutsEnabled: true});
     await profileShortcutToggleShortcutNotFound();
     browserProxy.resetResolver('getProfileShortcutStatus');
-    setFlags({profilesUIRevamp: true, profileShortcutsEnabled: true});
+    setFlags({newProfilePicker: true, profileShortcutsEnabled: true});
     await profileShortcutToggleShortcutNotFound();
   });
 
@@ -289,10 +289,10 @@ suite('ManageProfileTests', function() {
 
       assertFalse(!!manageProfile.$$('#hasShortcutToggle'));
     }
-    setFlags({profilesUIRevamp: false, profileShortcutsEnabled: true});
+    setFlags({newProfilePicker: false, profileShortcutsEnabled: true});
     await profileShortcutSettingHidden();
     browserProxy.resetResolver('getProfileShortcutStatus');
-    setFlags({profilesUIRevamp: true, profileShortcutsEnabled: true});
+    setFlags({newProfilePicker: true, profileShortcutsEnabled: true});
     await profileShortcutSettingHidden();
   });
 });

chrome/test/data/webui/signin/signin_browsertest.js

@@ -171,15 +171,6 @@ var ProfileCustomizationTest = class extends SigninBrowserTest {
   get browsePreload() {
     return 'chrome://profile-customization/test_loader.html?module=signin/profile_customization_test.js';
   }
-
-  /** @override */
-  get featureList() {
-    return {
-      enabled: [
-        'features::kProfilesUIRevamp',
-      ]
-    };
-  }
 };
 
 TEST_F('ProfileCustomizationTest', 'Bubble', function() {