Merge pull request #25915 from brave/pr25912_cr130-followup-hide-medi…

…a-control-caption-options_1.72.x

Hide caption options in media control popup (uplift to 1.72.x)

chromium_src/components/live_caption/caption_util.cc

@@ -0,0 +1,20 @@
+/* Copyright (c) 2024 The Brave Authors. All rights reserved.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+#include "components/live_caption/caption_util.h"
+
+#define IsLiveCaptionFeatureSupported IsLiveCaptionFeatureSupported_ChromiumImpl
+
+#include "src/components/live_caption/caption_util.cc"
+
+#undef IsLiveCaptionFeatureSupported
+
+namespace captions {
+
+bool IsLiveCaptionFeatureSupported() {
+  return false;
+}
+
+}  // namespace captions

test/filters/browser_tests-windows.filter

@@ -88,7 +88,6 @@
 -InterstitialUITest.*
 -IsolatedAppBrowserServiceWorkerPushTest.ServiceWorkerPartitionedWhenWakingUpDuetoPushNotification
 -KnownInterceptionDisclosureUITest.*
--LiveCaptionControllerTest.*
 -LocalePolicyTest.*
 -MediaSessionPictureInPictureWindowControllerBrowserTest.*
 -MediaSessionVideoPictureInPictureWindowControllerBrowserTest.*

test/filters/browser_tests.filter

@@ -1802,6 +1802,11 @@
 -ChromeLabsMultipleFeaturesUiTest.InvokeUi_default
 -ChromeLabsUiTest.InvokeUi_default
 
+# These tests fail because we stub captions::IsLiveCaptionFeatureSuppported to
+# always return false
+-LiveCaptionAutomaticLanguageDownloadTest.*
+-LiveCaptionControllerTest.*
+
 # Tests below this point have not been diagnosed or had issues created yet.
 -_/WebrtcLoggingPrivateApiStartEventLoggingTestFeatureAndPolicyEnabled.*
 -AccessCodeCastHandlerBrowserTest.*