Convert SpatialNavigationHost client to use BrowserInterfaceBroker

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

Bug: 936482
Change-Id: I21e9a3456b5e55b7e69907c7ae24d6d1e5d8364b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1824504
Commit-Queue: Miyoung Shin <myid.shin@igalia.com>
Reviewed-by: Oksana Zhuravlova <oksamyt@chromium.org>
Reviewed-by: Nico Weber <thakis@chromium.org>
Reviewed-by: Dominick Ng <dominickn@chromium.org>
Cr-Commit-Position: refs/heads/master@{#700150}

chrome/app/chrome_content_browser_overlay_manifest.cc

@@ -83,10 +83,6 @@
 #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
-
 const service_manager::Manifest& GetChromeContentBrowserOverlayManifest() {
   static base::NoDestructor<service_manager::Manifest> manifest {
     service_manager::ManifestBuilder()
@@ -165,9 +161,6 @@ const service_manager::Manifest& GetChromeContentBrowserOverlayManifest() {
                 blink::mojom::InstalledAppProvider,
 #if defined(BROWSER_MEDIA_CONTROLS_MENU)
                 blink::mojom::MediaControlsMenuHost,
-#endif
-#if defined(ENABLE_SPATIAL_NAVIGATION_HOST)
-                blink::mojom::SpatialNavigationHost,
 #endif
                 blink::mojom::TextSuggestionHost,
                 chrome::mojom::OfflinePageAutoFetcher,

chrome/browser/chrome_browser_interface_binders.cc

@@ -17,6 +17,9 @@
 #include "content/public/browser/web_contents.h"
 #include "services/service_manager/public/cpp/interface_provider.h"
 #include "third_party/blink/public/mojom/webshare/webshare.mojom.h"
+#if defined(ENABLE_SPATIAL_NAVIGATION_HOST)
+#include "third_party/blink/public/mojom/page/spatial_navigation.mojom.h"
+#endif
 #else
 #include "chrome/browser/badging/badge_manager.h"
 #endif
@@ -52,6 +55,10 @@ void PopulateChromeFrameBinders(
 #if defined(OS_ANDROID)
   map->Add<blink::mojom::ShareService>(base::BindRepeating(
       &ForwardToJavaWebContents<blink::mojom::ShareService>));
+#if defined(ENABLE_SPATIAL_NAVIGATION_HOST)
+  map->Add<blink::mojom::SpatialNavigationHost>(base::BindRepeating(
+      &ForwardToJavaWebContents<blink::mojom::SpatialNavigationHost>));
+#endif
 #else
   map->Add<blink::mojom::BadgeService>(
       base::BindRepeating(&badging::BadgeManager::BindReceiver));

chrome/browser/chrome_content_browser_client.cc

@@ -614,10 +614,6 @@
 #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
-
 using base::FileDescriptor;
 using content::BrowserThread;
 using content::BrowserURLHandler;
@@ -2005,16 +2001,6 @@ void ForwardToJavaFrameRegistry(mojo::InterfaceRequest<Interface> request,
                                 content::RenderFrameHost* render_frame_host) {
   render_frame_host->GetJavaInterfaces()->GetInterface(std::move(request));
 }
-
-template <typename Interface>
-void ForwardToJavaWebContentsRegistry(
-    mojo::InterfaceRequest<Interface> request,
-    content::RenderFrameHost* render_frame_host) {
-  content::WebContents* contents =
-      content::WebContents::FromRenderFrameHost(render_frame_host);
-  if (contents)
-    contents->GetJavaInterfaces()->GetInterface(std::move(request));
-}
 #endif
 
 }  // namespace
@@ -4455,13 +4441,6 @@ void ChromeContentBrowserClient::InitWebContextInterfaces() {
   }
 #endif
 
-#if defined(OS_ANDROID)
-#if defined(ENABLE_SPATIAL_NAVIGATION_HOST)
-  frame_interfaces_parameterized_->AddInterface(base::Bind(
-      &ForwardToJavaWebContentsRegistry<blink::mojom::SpatialNavigationHost>));
-#endif
-#endif
-
   frame_interfaces_parameterized_->AddInterface(
       base::BindRepeating(&NavigationPredictor::Create));
 

third_party/blink/renderer/core/page/spatial_navigation_controller.cc

@@ -4,7 +4,7 @@
 
 #include "third_party/blink/renderer/core/page/spatial_navigation_controller.h"
 
-#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/web_scroll_into_view_params.h"
 #include "third_party/blink/renderer/core/dom/document.h"
 #include "third_party/blink/renderer/core/dom/element.h"
@@ -641,7 +641,7 @@ SpatialNavigationController::GetSpatialNavigationHost() {
     if (!frame)
       return spatial_navigation_host_;
 
-    frame->GetInterfaceProvider().GetInterface(
+    frame->GetBrowserInterfaceBroker().GetInterface(
         spatial_navigation_host_.BindNewPipeAndPassReceiver(
             frame->GetTaskRunner(TaskType::kMiscPlatformAPI)));
   }

third_party/blink/web_tests/fast/spatial-navigation/resources/mock-snav-service.js

@@ -10,7 +10,7 @@ class MockSpatialNavigationHostService {
     this.callback = null;
     this.bindingSet_ = new mojo.BindingSet(blink.mojom.SpatialNavigationHost);
     this.interceptor_ = new MojoInterfaceInterceptor(
-        blink.mojom.SpatialNavigationHost.name);
+        blink.mojom.SpatialNavigationHost.name, "context", true);
     this.interceptor_.oninterfacerequest =
         e => this.bindingSet_.addBinding(this, e.handle);
     this.interceptor_.start();