Clean up feature flag ImprovedSemanticsActivityIndicators

Bug: 362247235
Change-Id: If7d78db668d720f659e4b2eb3a88c59cd3296087
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6098139
Reviewed-by: Christian Dullweber <dullweber@chromium.org>
Commit-Queue: Yifan Luo <lyf@chromium.org>
Reviewed-by: Dana Fried <dfried@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1401056}

chrome/browser/about_flags.cc

@@ -8416,13 +8416,6 @@ const FeatureEntry kFeatureEntries[] = {
      flag_descriptions::kOneTimePermissionDescription, kOsAll,
      FEATURE_VALUE_TYPE(permissions::features::kOneTimePermission)},
 
-    {"improved-semantics-activity-indicators",
-     flag_descriptions::kImprovedSemanticsActivityIndicatorsName,
-     flag_descriptions::kImprovedSemanticsActivityIndicatorsDescription,
-     kOsDesktop,
-     FEATURE_VALUE_TYPE(
-         content_settings::features::kImprovedSemanticsActivityIndicators)},
-
     {"left-hand-side-activity-indicators",
      flag_descriptions::kLeftHandSideActivityIndicatorsName,
      flag_descriptions::kLeftHandSideActivityIndicatorsDescription, kOsDesktop,

chrome/browser/content_settings/page_specific_content_settings_delegate.cc

@@ -53,12 +53,9 @@ using content_settings::PageSpecificContentSettings;
 PageSpecificContentSettingsDelegate::PageSpecificContentSettingsDelegate(
     content::WebContents* web_contents)
     : WebContentsObserver(web_contents) {
-  if (base::FeatureList::IsEnabled(
-          content_settings::features::kImprovedSemanticsActivityIndicators)) {
     media_observation_.Observe(MediaCaptureDevicesDispatcher::GetInstance()
                                    ->GetMediaStreamCaptureIndicator()
                                    .get());
-  }
 }
 
 PageSpecificContentSettingsDelegate::~PageSpecificContentSettingsDelegate() =

chrome/browser/flag_descriptions.cc

@@ -2991,11 +2991,6 @@ const char kForcedColorsName[] = "Forced Colors";
 const char kForcedColorsDescription[] =
     "Enables forced colors mode for web content.";
 
-const char kImprovedSemanticsActivityIndicatorsName[] =
-    "Improved semantics activity indicators";
-const char kImprovedSemanticsActivityIndicatorsDescription[] =
-    "Enables experimental improved semantics indicators in the location bar.";
-
 const char kLeftHandSideActivityIndicatorsName[] =
     "Left-hand side activity indicators";
 const char kLeftHandSideActivityIndicatorsDescription[] =

chrome/browser/ui/views/permissions/permission_indicators_interactive_uitest.cc

@@ -29,8 +29,7 @@ class PermissionIndicatorsInteractiveUITest : public InteractiveBrowserTest {
  public:
   PermissionIndicatorsInteractiveUITest() {
     scoped_feature_list_.InitWithFeatures(
-        {content_settings::features::kImprovedSemanticsActivityIndicators},
-        {content_settings::features::kLeftHandSideActivityIndicators});
+        {}, {content_settings::features::kLeftHandSideActivityIndicators});
     https_server_ = std::make_unique<net::EmbeddedTestServer>(
         net::EmbeddedTestServer::TYPE_HTTPS);
   }

chrome/browser/ui/views/tabs/alert_indicator_button.cc

@@ -328,9 +328,7 @@ AlertIndicatorButton::CreateTabAlertIndicatorFadeAnimation(
       alert_state == TabAlertState::VIDEO_RECORDING ||
       alert_state == TabAlertState::TAB_CAPTURING ||
       alert_state == TabAlertState::DESKTOP_CAPTURING) {
-    if (base::FeatureList::IsEnabled(
-            content_settings::features::kImprovedSemanticsActivityIndicators) &&
-        (alert_state == TabAlertState::MEDIA_RECORDING ||
+    if ((alert_state == TabAlertState::MEDIA_RECORDING ||
          alert_state == TabAlertState::AUDIO_RECORDING ||
          alert_state == TabAlertState::VIDEO_RECORDING) &&
         camera_mic_indicator_start_time_ == base::Time()) {
@@ -348,9 +346,7 @@ AlertIndicatorButton::CreateTabAlertIndicatorFadeAnimation(
   gfx::MultiAnimation::Parts parts;
   const bool is_for_fade_in = alert_state.has_value();
 
-  if (base::FeatureList::IsEnabled(
-          content_settings::features::kImprovedSemanticsActivityIndicators) &&
-      !is_for_fade_in && camera_mic_indicator_start_time_ != base::Time()) {
+  if (!is_for_fade_in && camera_mic_indicator_start_time_ != base::Time()) {
     base::TimeDelta delay =
         base::Time::Now() - camera_mic_indicator_start_time_;
     camera_mic_indicator_start_time_ = base::Time();

chrome/browser/ui/views/tabs/tab_unittest.cc

@@ -782,8 +782,6 @@ TEST_F(AlertIndicatorButtonTest, ShowsAndHidesAlertIndicator) {
 // visible at least for 5 seconds even if a camera/mic stopped being used.
 TEST_F(AlertIndicatorButtonTest, MinHoldDurationTest) {
   base::test::ScopedFeatureList scoped_feature_list_;
-  scoped_feature_list_.InitAndEnableFeature(
-      content_settings::features::kImprovedSemanticsActivityIndicators);
 
   controller_->AddTab(0, TabActive::kActive);
   Tab* media_tab = tab_strip_->tab_at(0);
@@ -815,8 +813,6 @@ TEST_F(AlertIndicatorButtonTest, MinHoldDurationTest) {
 // 1-second fadeout animation after it was visible for longer than 5 seconds.
 TEST_F(AlertIndicatorButtonTest, 1SecondFadeoutAnimationTest) {
   base::test::ScopedFeatureList scoped_feature_list_;
-  scoped_feature_list_.InitAndEnableFeature(
-      content_settings::features::kImprovedSemanticsActivityIndicators);
 
   controller_->AddTab(0, TabActive::kActive);
   Tab* media_tab = tab_strip_->tab_at(0);

components/content_settings/browser/page_specific_content_settings.cc

@@ -1290,8 +1290,6 @@ void PageSpecificContentSettings::OnMediaStreamPermissionSet(
     MaybeUpdateLocationBar();
   }
 
-  if (base::FeatureList::IsEnabled(
-          content_settings::features::kImprovedSemanticsActivityIndicators)) {
     // Camera and/or Mic is blocked, start a blocked indicator's dismiss timer.
     if (microphone_camera_state_.Has(kMicrophoneBlocked)) {
       StartBlockedIndicatorTimer(ContentSettingsType::MEDIASTREAM_MIC);
@@ -1299,7 +1297,6 @@ void PageSpecificContentSettings::OnMediaStreamPermissionSet(
     if (microphone_camera_state_.Has(kCameraBlocked)) {
       StartBlockedIndicatorTimer(ContentSettingsType::MEDIASTREAM_CAMERA);
     }
-  }
 }
 
 void PageSpecificContentSettings::AddPermissionUsageObserver(

components/content_settings/browser/page_specific_content_settings_unittest.cc

@@ -1380,8 +1380,7 @@ TEST_F(PageSpecificContentSettingsTest, GetLastUsedReturnCorrectTimeTest) {
 TEST_F(PageSpecificContentSettingsTest, MediaBlockedIndicatorsDismissDelay) {
   base::test::ScopedFeatureList scoped_feature_list_;
   scoped_feature_list_.InitWithFeatures(
-      {content_settings::features::kImprovedSemanticsActivityIndicators},
-      {content_settings::features::kLeftHandSideActivityIndicators});
+      {}, {content_settings::features::kLeftHandSideActivityIndicators});
 
   NavigateAndCommit(GURL("http://google.com"));
 
@@ -1421,9 +1420,6 @@ TEST_F(PageSpecificContentSettingsTest, MediaBlockedIndicatorsDismissDelay) {
 TEST_F(PageSpecificContentSettingsTest,
        MediaIndicatorsDoNotDismissIfOpenedDelay) {
   base::test::ScopedFeatureList scoped_feature_list_;
-  scoped_feature_list_.InitAndEnableFeature(
-      content_settings::features::kImprovedSemanticsActivityIndicators);
-
   NavigateAndCommit(GURL("http://google.com"));
 
   PageSpecificContentSettings* pscs = PageSpecificContentSettings::GetForFrame(

components/content_settings/core/common/features.cc

@@ -78,10 +78,6 @@ BASE_FEATURE(kUserBypassFeedback,
              "UserBypassFeedback",
              base::FEATURE_ENABLED_BY_DEFAULT);
 
-BASE_FEATURE(kImprovedSemanticsActivityIndicators,
-             "ImprovedSemanticsActivityIndicators",
-             base::FEATURE_ENABLED_BY_DEFAULT);
-
 BASE_FEATURE(kLeftHandSideActivityIndicators,
              "LeftHandSideActivityIndicators",
              base::FEATURE_ENABLED_BY_DEFAULT);

components/content_settings/core/common/features.h

@@ -99,10 +99,6 @@ COMPONENT_EXPORT(CONTENT_SETTINGS_FEATURES)
 extern const base::FeatureParam<base::TimeDelta>
     kUserBypassUIReloadBubbleTimeout;
 
-// Hide activity indicators if a permission is no longer used.
-COMPONENT_EXPORT(CONTENT_SETTINGS_FEATURES)
-BASE_DECLARE_FEATURE(kImprovedSemanticsActivityIndicators);
-
 // Move activity indicators to the left-hand side of Omnibox.
 COMPONENT_EXPORT(CONTENT_SETTINGS_FEATURES)
 BASE_DECLARE_FEATURE(kLeftHandSideActivityIndicators);

testing/variations/fieldtrial_testing_config.json

@@ -12366,24 +12366,6 @@
             ]
         }
     ],
-    "ImprovedSemanticsActivityIndicators": [
-        {
-            "platforms": [
-                "chromeos",
-                "linux",
-                "mac",
-                "windows"
-            ],
-            "experiments": [
-                {
-                    "name": "Enabled",
-                    "enable_features": [
-                        "ImprovedSemanticsActivityIndicators"
-                    ]
-                }
-            ]
-        }
-    ],
     "IncognitoScreenshot": [
         {
             "platforms": [