Convert ControllerServiceWorkerConnector to new Mojo types

This CL converts ControllerServiceWorkerConnectorPtr and
ControllerServiceWorkerConnectorRequest in content to new Mojo
types.

Bug: 955171, 978694
Change-Id: I95f3b708a19e3b0abce281a819c18a733bc6a546
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1757719Reviewed-by: Ken Rockot <rockot@google.com>
Reviewed-by: Hiroki Nakagawa <nhiroki@chromium.org>
Commit-Queue: Miyoung Shin <myid.shin@igalia.com>
Cr-Commit-Position: refs/heads/master@{#688053}

content/renderer/service_worker/controller_service_worker_connector.cc

@@ -6,7 +6,6 @@
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
-#include "mojo/public/cpp/bindings/interface_request.h"
 
 namespace content {
 
@@ -77,8 +76,9 @@ void ControllerServiceWorkerConnector::OnControllerConnectionClosed() {
 }
 
 void ControllerServiceWorkerConnector::AddBinding(
-    blink::mojom::ControllerServiceWorkerConnectorRequest request) {
-  bindings_.AddBinding(this, std::move(request));
+    mojo::PendingReceiver<blink::mojom::ControllerServiceWorkerConnector>
+        receiver) {
+  receivers_.Add(this, std::move(receiver));
 }
 
 void ControllerServiceWorkerConnector::UpdateController(

content/renderer/service_worker/controller_service_worker_connector.h

@@ -12,7 +12,9 @@
 #include "base/observer_list.h"
 #include "content/common/content_export.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
+#include "mojo/public/cpp/bindings/pending_receiver.h"
 #include "mojo/public/cpp/bindings/pending_remote.h"
+#include "mojo/public/cpp/bindings/receiver_set.h"
 #include "mojo/public/cpp/bindings/remote.h"
 #include "third_party/blink/public/mojom/service_worker/controller_service_worker.mojom.h"
 #include "third_party/blink/public/mojom/service_worker/service_worker_container.mojom.h"
@@ -82,7 +84,8 @@ class CONTENT_EXPORT ControllerServiceWorkerConnector
   void OnControllerConnectionClosed();
 
   void AddBinding(
-      blink::mojom::ControllerServiceWorkerConnectorRequest request);
+      mojo::PendingReceiver<blink::mojom::ControllerServiceWorkerConnector>
+          receiver);
 
   // blink::mojom::ControllerServiceWorkerConnector:
   void UpdateController(
@@ -102,7 +105,7 @@ class CONTENT_EXPORT ControllerServiceWorkerConnector
   friend class base::RefCounted<ControllerServiceWorkerConnector>;
   ~ControllerServiceWorkerConnector() override;
 
-  mojo::BindingSet<blink::mojom::ControllerServiceWorkerConnector> bindings_;
+  mojo::ReceiverSet<blink::mojom::ControllerServiceWorkerConnector> receivers_;
 
   // Connection to the container host in the browser process.
   blink::mojom::ServiceWorkerContainerHostPtr container_host_ptr_;

content/renderer/service_worker/service_worker_provider_context.cc

@@ -20,6 +20,7 @@
 #include "content/renderer/service_worker/service_worker_subresource_loader.h"
 #include "content/renderer/service_worker/web_service_worker_provider_impl.h"
 #include "content/renderer/worker/worker_thread_registry.h"
+#include "mojo/public/cpp/bindings/pending_receiver.h"
 #include "mojo/public/cpp/bindings/pending_remote.h"
 #include "services/network/public/cpp/shared_url_loader_factory.h"
 #include "services/network/public/cpp/weak_wrapper_shared_url_loader_factory.h"
@@ -36,12 +37,13 @@ void CreateSubresourceLoaderFactoryForProviderContext(
         remote_controller,
     const std::string& client_id,
     std::unique_ptr<network::SharedURLLoaderFactoryInfo> fallback_factory_info,
-    blink::mojom::ControllerServiceWorkerConnectorRequest connector_request,
+    mojo::PendingReceiver<blink::mojom::ControllerServiceWorkerConnector>
+        connector_receiver,
     network::mojom::URLLoaderFactoryRequest request,
     scoped_refptr<base::SequencedTaskRunner> task_runner) {
   auto connector = base::MakeRefCounted<ControllerServiceWorkerConnector>(
       std::move(container_host_info), std::move(remote_controller), client_id);
-  connector->AddBinding(std::move(connector_request));
+  connector->AddBinding(std::move(connector_receiver));
   ServiceWorkerSubresourceLoaderFactory::Create(
       std::move(connector),
       network::SharedURLLoaderFactory::Create(std::move(fallback_factory_info)),
@@ -125,7 +127,7 @@ ServiceWorkerProviderContext::GetSubresourceLoaderFactoryInternal() {
         base::BindOnce(&CreateSubresourceLoaderFactoryForProviderContext,
                        std::move(host_ptr_info), std::move(remote_controller_),
                        client_id_, fallback_loader_factory_->Clone(),
-                       mojo::MakeRequest(&controller_connector_),
+                       controller_connector_.BindNewPipeAndPassReceiver(),
                        mojo::MakeRequest(&subresource_loader_factory_),
                        task_runner));
 

content/renderer/service_worker/service_worker_provider_context.h

@@ -18,6 +18,7 @@
 #include "mojo/public/cpp/bindings/associated_binding.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
 #include "mojo/public/cpp/bindings/pending_remote.h"
+#include "mojo/public/cpp/bindings/remote.h"
 #include "services/network/public/mojom/url_loader_factory.mojom.h"
 #include "third_party/blink/public/mojom/service_worker/controller_service_worker.mojom.h"
 #include "third_party/blink/public/mojom/service_worker/service_worker_container.mojom.h"
@@ -295,7 +296,8 @@ class CONTENT_EXPORT ServiceWorkerProviderContext
   // populated when GetSubresourceLoader() creates the subresource loader
   // factory and takes |controller_endpoint_|.
   mojo::PendingRemote<blink::mojom::ControllerServiceWorker> remote_controller_;
-  blink::mojom::ControllerServiceWorkerConnectorPtr controller_connector_;
+  mojo::Remote<blink::mojom::ControllerServiceWorkerConnector>
+      controller_connector_;
 
   bool sent_execution_ready_ = false;