diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json index 8c4592a6c7a552..cb011951cf6ff7 100644 --- a/chrome/browser/flag-metadata.json +++ b/chrome/browser/flag-metadata.json @@ -7168,11 +7168,6 @@ "owners": [ "zentaro", "jimmyxgong", "cros-peripherals@google.com" ], "expiry_milestone": 120 }, - { - "name": "use-sf-symbols", - "owners": [ "ewannpv", "gambard", "bling-flags@google.com" ], - "expiry_milestone": 113 - }, { "name": "use-sf-symbols-omnibox", "owners": [ "ewannpv", "gambard", "bling-flags@google.com" ], diff --git a/ios/chrome/browser/flags/about_flags.mm b/ios/chrome/browser/flags/about_flags.mm index 53d1c8f640d065..489195398f31a3 100644 --- a/ios/chrome/browser/flags/about_flags.mm +++ b/ios/chrome/browser/flags/about_flags.mm @@ -950,9 +950,6 @@ flag_descriptions::kMediaPermissionsControlName, flag_descriptions::kMediaPermissionsControlDescription, flags_ui::kOsIos, FEATURE_VALUE_TYPE(web::features::kMediaPermissionsControl)}, - {"use-sf-symbols", flag_descriptions::kUseSFSymbolsName, - flag_descriptions::kUseSFSymbolsDescription, flags_ui::kOsIos, - FEATURE_VALUE_TYPE(kUseSFSymbols)}, {"enable-password-grouping", flag_descriptions::kPasswordsGroupingName, flag_descriptions::kPasswordsGroupingDescription, flags_ui::kOsIos, FEATURE_VALUE_TYPE(password_manager::features::kPasswordsGrouping)}, diff --git a/ios/chrome/browser/flags/ios_chrome_flag_descriptions.cc b/ios/chrome/browser/flags/ios_chrome_flag_descriptions.cc index ff36375c8de94a..1fe9b78d081891 100644 --- a/ios/chrome/browser/flags/ios_chrome_flag_descriptions.cc +++ b/ios/chrome/browser/flags/ios_chrome_flag_descriptions.cc @@ -988,10 +988,6 @@ const char kUseLoadSimulatedRequestForOfflinePageDescription[] = "When enabled, the offline pages uses the iOS 15 " "loadSimulatedRequest:responseHTMLString: API"; -const char kUseSFSymbolsName[] = "Replace Image by SFSymbols"; -const char kUseSFSymbolsDescription[] = - "When enabled, images are replaced by SFSymbols"; - const char kUseSFSymbolsInOmniboxName[] = "Replace Image by SFSymbols in Omnibox"; const char kUseSFSymbolsInOmniboxDescription[] = diff --git a/ios/chrome/browser/flags/ios_chrome_flag_descriptions.h b/ios/chrome/browser/flags/ios_chrome_flag_descriptions.h index 99d8112e928413..f9d5435209952a 100644 --- a/ios/chrome/browser/flags/ios_chrome_flag_descriptions.h +++ b/ios/chrome/browser/flags/ios_chrome_flag_descriptions.h @@ -856,11 +856,6 @@ extern const char kTabInactivityThresholdDescription[]; extern const char kUseLoadSimulatedRequestForOfflinePageName[]; extern const char kUseLoadSimulatedRequestForOfflinePageDescription[]; -// Title and description for the flag to enable the replacement of images -// by SFSymbols. -extern const char kUseSFSymbolsName[]; -extern const char kUseSFSymbolsDescription[]; - // Title and description for the flag to enable the replacement of images // by SFSymbols in omnibox. extern const char kUseSFSymbolsInOmniboxName[]; diff --git a/ios/chrome/browser/overlays/public/infobar_banner/sync_error_infobar_banner_overlay_request_config_unittest.mm b/ios/chrome/browser/overlays/public/infobar_banner/sync_error_infobar_banner_overlay_request_config_unittest.mm index 07ca7a01b7f4d1..e47904619d04cf 100644 --- a/ios/chrome/browser/overlays/public/infobar_banner/sync_error_infobar_banner_overlay_request_config_unittest.mm +++ b/ios/chrome/browser/overlays/public/infobar_banner/sync_error_infobar_banner_overlay_request_config_unittest.mm @@ -65,9 +65,6 @@ // Tests the SyncErrorInfobarBannerOverlayRequestConfig then SF symbol is // enabled. TEST_F(SyncErrorInfobarBannerOverlayRequestConfigTest, IconConfigsForSFSymbol) { - base::test::ScopedFeatureList feature_list; - feature_list.InitAndEnableFeature(kUseSFSymbols); - std::unique_ptr request = OverlayRequest::CreateWithConfig( infobar_.get()); @@ -83,24 +80,3 @@ EXPECT_EQ(kMessageText, config->message_text()); EXPECT_EQ(kButtonLabelText, config->button_label_text()); } - -// Tests the SyncErrorInfobarBannerOverlayRequestConfig when SF symbol is not -// enabled. -TEST_F(SyncErrorInfobarBannerOverlayRequestConfigTest, - IconConfigsForLegacyAsset) { - base::test::ScopedFeatureList feature_list; - feature_list.InitAndDisableFeature(kUseSFSymbols); - - std::unique_ptr request = - OverlayRequest::CreateWithConfig( - infobar_.get()); - SyncErrorBannerRequestConfig* config = - request->GetConfig(); - - EXPECT_NSEQ(nullptr, config->icon_image_tint_color()); - EXPECT_NSEQ(nullptr, config->background_tint_color()); - EXPECT_EQ(true, config->use_icon_background_tint()); - EXPECT_EQ(kTitleText, config->title_text()); - EXPECT_EQ(kMessageText, config->message_text()); - EXPECT_EQ(kButtonLabelText, config->button_label_text()); -} diff --git a/ios/chrome/browser/shared/public/features/features.cc b/ios/chrome/browser/shared/public/features/features.cc index 0e386e5ca8a95a..9a69d79bd64601 100644 --- a/ios/chrome/browser/shared/public/features/features.cc +++ b/ios/chrome/browser/shared/public/features/features.cc @@ -120,8 +120,6 @@ BASE_FEATURE(kEnableShortenedPasswordAutoFillInstruction, "EnableShortenedPasswordAutoFillInstruction", base::FEATURE_ENABLED_BY_DEFAULT); -BASE_FEATURE(kUseSFSymbols, "UseSFSymbols", base::FEATURE_ENABLED_BY_DEFAULT); - BASE_FEATURE(kUseSFSymbolsInOmnibox, "UseSFSymbolsInOmnibox", base::FEATURE_DISABLED_BY_DEFAULT); diff --git a/ios/chrome/browser/shared/public/features/features.h b/ios/chrome/browser/shared/public/features/features.h index f7b12fabb235fd..6a3e469c936f09 100644 --- a/ios/chrome/browser/shared/public/features/features.h +++ b/ios/chrome/browser/shared/public/features/features.h @@ -100,9 +100,6 @@ BASE_DECLARE_FEATURE(kRemoveExcessNTPs); // Chrome. BASE_DECLARE_FEATURE(kEnableShortenedPasswordAutoFillInstruction); -// Feature flag to switch images to SFSymbols when enabled. -BASE_DECLARE_FEATURE(kUseSFSymbols); - // Feature flag to switch images to SFSymbols in the omnibox when enabled. BASE_DECLARE_FEATURE(kUseSFSymbolsInOmnibox); diff --git a/ios/chrome/browser/ui/icons/symbol_helpers.mm b/ios/chrome/browser/ui/icons/symbol_helpers.mm index c31eaa690cdb1d..5eeda093283c76 100644 --- a/ios/chrome/browser/ui/icons/symbol_helpers.mm +++ b/ios/chrome/browser/ui/icons/symbol_helpers.mm @@ -45,7 +45,7 @@ } // namespace bool UseSymbols() { - return base::FeatureList::IsEnabled(kUseSFSymbols); + return true; } bool UseSymbolsInOmnibox() { diff --git a/ios/chrome/browser/ui/menu/action_factory_unittest.mm b/ios/chrome/browser/ui/menu/action_factory_unittest.mm index 7e02cfac6b6ffd..0305ac25645610 100644 --- a/ios/chrome/browser/ui/menu/action_factory_unittest.mm +++ b/ios/chrome/browser/ui/menu/action_factory_unittest.mm @@ -34,9 +34,7 @@ // Test fixture for the ActionFactory. class ActionFactoryTest : public PlatformTest { protected: - ActionFactoryTest() : test_title_(@"SomeTitle") { - feature_list_.InitAndEnableFeature(kUseSFSymbols); - } + ActionFactoryTest() : test_title_(@"SomeTitle") {} // Creates a blue square. UIImage* CreateMockImage() { diff --git a/ios/chrome/browser/ui/menu/browser_action_factory_unittest.mm b/ios/chrome/browser/ui/menu/browser_action_factory_unittest.mm index 58f71820656ce5..c71058521bdfdd 100644 --- a/ios/chrome/browser/ui/menu/browser_action_factory_unittest.mm +++ b/ios/chrome/browser/ui/menu/browser_action_factory_unittest.mm @@ -50,9 +50,7 @@ protected: BrowserActionFactoryTest() : test_title_(@"SomeTitle"), - scene_state_([[SceneState alloc] initWithAppState:nil]) { - feature_list_.InitAndEnableFeature(kUseSFSymbols); - } + scene_state_([[SceneState alloc] initWithAppState:nil]) {} void SetUp() override { TestChromeBrowserState::Builder test_cbs_builder; diff --git a/ios/chrome/browser/ui/overlays/infobar_banner/sync_error/sync_error_infobar_banner_overlay_mediator_unittest.mm b/ios/chrome/browser/ui/overlays/infobar_banner/sync_error/sync_error_infobar_banner_overlay_mediator_unittest.mm index e4d7b4f5619489..65cf554fa24f93 100644 --- a/ios/chrome/browser/ui/overlays/infobar_banner/sync_error/sync_error_infobar_banner_overlay_mediator_unittest.mm +++ b/ios/chrome/browser/ui/overlays/infobar_banner/sync_error/sync_error_infobar_banner_overlay_mediator_unittest.mm @@ -97,9 +97,6 @@ @protocol SyncPresenter; // consumer's icon using SF symbol. TEST_F(SyncErrorInfobarBannerOverlayMediatorTest, SetUpConsumerWithIconSettingsUseSFSymbol) { - base::test::ScopedFeatureList feature_list; - feature_list.InitAndEnableFeature(kUseSFSymbols); - mediator_.consumer = consumer_mock_; // Verify that the infobar's icon was set up properly. OCMExpect([consumer_mock_ @@ -108,17 +105,3 @@ @protocol SyncPresenter; setIconBackgroundColor:[UIColor colorNamed:kRed500Color]]); OCMExpect([consumer_mock_ setUseIconBackgroundTint:true]); } - -// Tests that a SyncErrorInfobarBannerOverlayMediator correctly sets up its -// consumer's icon using legacy asset. -TEST_F(SyncErrorInfobarBannerOverlayMediatorTest, - SetUpConsumerWithIconSettingsUseLegacyAsset) { - base::test::ScopedFeatureList feature_list; - feature_list.InitAndDisableFeature(kUseSFSymbols); - - mediator_.consumer = consumer_mock_; - // Verify that the infobar's icon was set up properly. - OCMExpect([consumer_mock_ setIconImageTintColor:nullptr]); - OCMExpect([consumer_mock_ setIconBackgroundColor:nullptr]); - OCMExpect([consumer_mock_ setUseIconBackgroundTint:false]); -} diff --git a/ios/chrome/browser/ui/settings/sync/utils/sync_error_infobar_delegate_unittest.mm b/ios/chrome/browser/ui/settings/sync/utils/sync_error_infobar_delegate_unittest.mm index b9c02f2a32677f..3ed0c897ef7cb8 100644 --- a/ios/chrome/browser/ui/settings/sync/utils/sync_error_infobar_delegate_unittest.mm +++ b/ios/chrome/browser/ui/settings/sync/utils/sync_error_infobar_delegate_unittest.mm @@ -54,9 +54,6 @@ void SetUp() override { // Tests that the delegate's icon configurations is correct when UseSymbol is // enabled. TEST_F(SyncErrorInfobarDelegateTest, IconConfigsUseSymbol) { - base::test::ScopedFeatureList feature_list; - feature_list.InitAndEnableFeature(kUseSFSymbols); - id presenter = OCMStrictProtocolMock(@protocol(SyncPresenter)); std::unique_ptr delegate( new SyncErrorInfoBarDelegate(chrome_browser_state_.get(), presenter)); @@ -71,21 +68,6 @@ void SetUp() override { delegate->GetIcon().GetImage().ToUIImage()); } -// Tests that the delegate's icon configurations is correct when legacy image -// asset is used. -TEST_F(SyncErrorInfobarDelegateTest, IconConfigsNotUseSymbol) { - base::test::ScopedFeatureList feature_list; - feature_list.InitAndDisableFeature(kUseSFSymbols); - - id presenter = OCMStrictProtocolMock(@protocol(SyncPresenter)); - std::unique_ptr delegate( - new SyncErrorInfoBarDelegate(chrome_browser_state_.get(), presenter)); - - EXPECT_FALSE(delegate->UseIconBackgroundTint()); - EXPECT_EQ(nullptr, delegate->GetIconImageTintColor()); - EXPECT_EQ(nullptr, delegate->GetIconBackgroundColor()); -} - TEST_F(SyncErrorInfobarDelegateTest, SyncServiceSignInNeedsUpdate) { ON_CALL(*mock_sync_service(), GetUserActionableError()) .WillByDefault(