Convert MediaControlsMenuHost client to use BrowserInterfaceBroker

This change converts MediaControlsMenuHost mojom interface client in blink
to use BrowserInterfaceBroker.

Bug: 936482
Change-Id: Iefe4ce64adfd4b67d6a12b18a400cf503d97369f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1824917
Commit-Queue: Miyoung Shin <myid.shin@igalia.com>
Reviewed-by: Mounir Lamouri <mlamouri@chromium.org>
Reviewed-by: Oksana Zhuravlova <oksamyt@chromium.org>
Reviewed-by: Avi Drissman <avi@chromium.org>
Reviewed-by: Dominick Ng <dominickn@chromium.org>
Cr-Commit-Position: refs/heads/master@{#700452}

chrome/app/chrome_content_browser_overlay_manifest.cc

@@ -79,10 +79,6 @@
 #include "extensions/common/mojom/keep_alive.mojom.h"  // nogncheck
 #endif
 
-#if defined(BROWSER_MEDIA_CONTROLS_MENU)
-#include "third_party/blink/public/mojom/media_controls/touchless/media_controls.mojom.h"
-#endif
-
 const service_manager::Manifest& GetChromeContentBrowserOverlayManifest() {
   static base::NoDestructor<service_manager::Manifest> manifest {
     service_manager::ManifestBuilder()
@@ -158,9 +154,6 @@ const service_manager::Manifest& GetChromeContentBrowserOverlayManifest() {
             service_manager::Manifest::InterfaceList<
                 autofill::mojom::AutofillDriver,
                 autofill::mojom::PasswordManagerDriver,
-#if defined(BROWSER_MEDIA_CONTROLS_MENU)
-                blink::mojom::MediaControlsMenuHost,
-#endif
                 blink::mojom::TextSuggestionHost,
                 chrome::mojom::OfflinePageAutoFetcher,
                 chrome::mojom::PrerenderCanceler,

chrome/browser/chrome_browser_interface_binders.cc

@@ -18,6 +18,9 @@
 #include "services/service_manager/public/cpp/interface_provider.h"
 #include "third_party/blink/public/mojom/installedapp/installed_app_provider.mojom.h"
 #include "third_party/blink/public/mojom/webshare/webshare.mojom.h"
+#if defined(BROWSER_MEDIA_CONTROLS_MENU)
+#include "third_party/blink/public/mojom/media_controls/touchless/media_controls.mojom.h"
+#endif
 #if defined(ENABLE_SPATIAL_NAVIGATION_HOST)
 #include "third_party/blink/public/mojom/page/spatial_navigation.mojom.h"
 #endif
@@ -64,6 +67,10 @@ void PopulateChromeFrameBinders(
 #if defined(OS_ANDROID)
   map->Add<blink::mojom::InstalledAppProvider>(base::BindRepeating(
       &ForwardToJavaFrameRegistry<blink::mojom::InstalledAppProvider>));
+#if defined(BROWSER_MEDIA_CONTROLS_MENU)
+  map->Add<blink::mojom::MediaControlsMenuHost>(base::BindRepeating(
+      &ForwardToJavaFrameRegistry<blink::mojom::MediaControlsMenuHost>));
+#endif
   map->Add<blink::mojom::ShareService>(base::BindRepeating(
       &ForwardToJavaWebContents<blink::mojom::ShareService>));
 #if defined(ENABLE_SPATIAL_NAVIGATION_HOST)

chrome/browser/chrome_content_browser_client.cc

@@ -609,10 +609,6 @@
 #endif
 #endif
 
-#if defined(BROWSER_MEDIA_CONTROLS_MENU)
-#include "third_party/blink/public/mojom/media_controls/touchless/media_controls.mojom.h"
-#endif
-
 using base::FileDescriptor;
 using content::BrowserThread;
 using content::BrowserURLHandler;
@@ -4410,10 +4406,6 @@ void ChromeContentBrowserClient::InitWebContextInterfaces() {
       base::Bind(&ForwardToJavaFrameRegistry<payments::mojom::PaymentRequest>));
   frame_interfaces_parameterized_->AddInterface(
       base::Bind(&ForwardToJavaFrameRegistry<blink::mojom::Authenticator>));
-#if defined(BROWSER_MEDIA_CONTROLS_MENU)
-  frame_interfaces_parameterized_->AddInterface(base::Bind(
-      &ForwardToJavaFrameRegistry<blink::mojom::MediaControlsMenuHost>));
-#endif
 #else
   if (base::FeatureList::IsEnabled(features::kWebPayments)) {
     frame_interfaces_parameterized_->AddInterface(

third_party/blink/renderer/modules/media_controls/touchless/media_controls_touchless_impl.cc

@@ -6,7 +6,7 @@
 
 #include <algorithm>
 
-#include "services/service_manager/public/cpp/interface_provider.h"
+#include "third_party/blink/public/common/browser_interface_broker_proxy.h"
 #include "third_party/blink/public/platform/task_type.h"
 #include "third_party/blink/public/platform/web_screen_info.h"
 #include "third_party/blink/renderer/core/css/properties/css_property.h"
@@ -243,7 +243,7 @@ void MediaControlsTouchlessImpl::OnKeyDown(KeyboardEvent* event) {
 
 void MediaControlsTouchlessImpl::EnsureMediaControlsMenuHost() {
   if (!media_controls_host_) {
-    GetDocument().GetFrame()->GetInterfaceProvider().GetInterface(
+    GetDocument().GetBrowserInterfaceBroker().GetInterface(
         media_controls_host_.BindNewPipeAndPassReceiver(
             GetExecutionContext()->GetTaskRunner(
                 blink::TaskType::kMediaElementEvent)));