[mojo] Convert PushMessagingClient to use BrowserInterfaceBroker

Bug: 995422
Change-Id: I384e85321bdc8987e0e39a633833bb242354dfc1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1811990Reviewed-by: Alex Moshchuk <alexmos@chromium.org>
Reviewed-by: Richard Knoll <knollr@chromium.org>
Reviewed-by: Kinuko Yasuda <kinuko@chromium.org>
Commit-Queue: Oksana Zhuravlova <oksamyt@chromium.org>
Cr-Commit-Position: refs/heads/master@{#699853}

content/browser/browser_interface_binders.cc

@@ -82,6 +82,9 @@ void PopulateFrameBinders(RenderFrameHostImpl* host,
 
   map->Add<blink::mojom::WebBluetoothService>(base::BindRepeating(
       &RenderFrameHostImpl::CreateWebBluetoothService, base::Unretained(host)));
+
+  map->Add<blink::mojom::PushMessaging>(base::BindRepeating(
+      &RenderFrameHostImpl::GetPushMessaging, base::Unretained(host)));
 }
 
 void PopulateBinderMapWithContext(

content/browser/frame_host/render_frame_host_impl.h

@@ -1083,6 +1083,9 @@ class CONTENT_EXPORT RenderFrameHostImpl
   void CreateWebBluetoothService(
       mojo::PendingReceiver<blink::mojom::WebBluetoothService> receiver);
 
+  void GetPushMessaging(
+      mojo::PendingReceiver<blink::mojom::PushMessaging> receiver);
+
   // https://mikewest.github.io/corpp/#initialize-embedder-policy-for-global
   network::mojom::CrossOriginEmbedderPolicy cross_origin_embedder_policy()
       const {
@@ -1597,8 +1600,6 @@ class CONTENT_EXPORT RenderFrameHostImpl
       mojo::PendingReceiver<blink::mojom::CredentialManager> receiver) override;
   void GetAuthenticator(
       mojo::PendingReceiver<blink::mojom::Authenticator> receiver) override;
-  void GetPushMessaging(
-      mojo::PendingReceiver<blink::mojom::PushMessaging> receiver) override;
   void GetVirtualAuthenticatorManager(
       mojo::PendingReceiver<blink::test::mojom::VirtualAuthenticatorManager>
           receiver) override;

content/renderer/render_frame_impl_browsertest.cc

@@ -788,8 +788,6 @@ class TestSimpleDocumentInterfaceBrokerImpl
       mojo::PendingReceiver<blink::mojom::CredentialManager>) override {}
   void GetAuthenticator(
       mojo::PendingReceiver<blink::mojom::Authenticator> receiver) override {}
-  void GetPushMessaging(
-      mojo::PendingReceiver<blink::mojom::PushMessaging> receiver) override {}
   void GetVirtualAuthenticatorManager(
       mojo::PendingReceiver<blink::test::mojom::VirtualAuthenticatorManager>
           receiver) override {}

third_party/blink/public/mojom/frame/document_interface_broker.mojom

@@ -6,7 +6,6 @@ module blink.mojom;
 
 import "third_party/blink/public/mojom/credentialmanager/credential_manager.mojom";
 import "third_party/blink/public/mojom/frame/frame_host_test_interface.mojom";
-import "third_party/blink/public/mojom/push_messaging/push_messaging.mojom";
 import "third_party/blink/public/mojom/webauthn/authenticator.mojom";
 import "third_party/blink/public/mojom/webauthn/virtual_authenticator.mojom";
 
@@ -30,11 +29,6 @@ interface DocumentInterfaceBroker {
   GetFrameHostTestInterface(
       pending_receiver<blink.mojom.FrameHostTestInterface> receiver);
 
-  // Binds the blink.mojom.PushMessaging pending receiver to its remote
-  // implementation in the browser process, to allow subscribing, unsubscribing
-  // and retrieving subscriptions related to push notifications (see Push API).
-  GetPushMessaging(pending_receiver<blink.mojom.PushMessaging> receiver);
-
   // Binds the blink.test.mojom.VirtualAuthenticatorManager pending receiver to
   // its remote implementation in the browser process, to manage a virtual
   // environment that allows talking virtual authenticators via the WebAuth API.

third_party/blink/renderer/modules/push_messaging/push_messaging_client.cc

@@ -7,7 +7,7 @@
 #include <string>
 #include <utility>
 
-#include "third_party/blink/public/mojom/frame/document_interface_broker.mojom-blink.h"
+#include "third_party/blink/public/common/browser_interface_broker_proxy.h"
 #include "third_party/blink/public/mojom/push_messaging/push_messaging_status.mojom-blink.h"
 #include "third_party/blink/public/platform/platform.h"
 #include "third_party/blink/public/web/web_local_frame.h"
@@ -43,7 +43,7 @@ PushMessagingClient* PushMessagingClient::From(LocalFrame* frame) {
 
 mojom::blink::PushMessaging* PushMessagingClient::GetPushMessagingRemote() {
   if (!push_messaging_manager_) {
-    GetSupplementable()->GetDocumentInterfaceBroker().GetPushMessaging(
+    GetSupplementable()->GetBrowserInterfaceBroker().GetInterface(
         push_messaging_manager_.BindNewPipeAndPassReceiver(
             GetSupplementable()->GetTaskRunner(TaskType::kMiscPlatformAPI)));
   }