Migrate Service::OnStart to new Mojo types

This CL applies the new Mojo types to the callback of OnStart
in Service interface.

  - Convert FooRequest to mojo::PendingReceiver.
  - Convert FooAssociatedPtr to AssocitedRemote.
  - Convert FooAssociatedRequest to PendingAssociatedReceiver.
  - Convert AssociatedBindingSet to AssociatedReceiverSet.

Bug: 955171
Change-Id: I7e3efc212a5272ef8c29977e150126c75ea0fc32
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1875009Reviewed-by: Kenneth MacKay <kmackay@chromium.org>
Reviewed-by: Sam McNally <sammc@chromium.org>
Reviewed-by: Ken Rockot <rockot@google.com>
Commit-Queue: Gyuyoung Kim <gyuyoung@igalia.com>
Cr-Commit-Position: refs/heads/master@{#709128}

chromecast/external_mojo/external_service_support/chromium_service.cc

@@ -11,6 +11,7 @@
 #include "base/token.h"
 #include "chromecast/external_mojo/external_service_support/external_connector.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
+#include "mojo/public/cpp/bindings/pending_associated_receiver.h"
 #include "services/service_manager/public/cpp/bind_source_info.h"
 #include "services/service_manager/public/cpp/connector.h"
 #include "services/service_manager/public/mojom/connector.mojom.h"
@@ -24,7 +25,8 @@ namespace {
 void OnStartCallback(
     ExternalConnector* connector,
     service_manager::mojom::ConnectorRequest connector_request,
-    service_manager::mojom::ServiceControlAssociatedRequest control_request) {
+    mojo::PendingAssociatedReceiver<service_manager::mojom::ServiceControl>
+        control_receiver) {
   DCHECK(connector);
   if (connector_request.is_pending()) {
     connector->SendChromiumConnectorRequest(

services/service_manager/public/cpp/service_binding.cc

@@ -145,7 +145,7 @@ void ServiceBinding::OnStart(const Identity& identity,
   if (!pending_connector_request_.is_pending())
     connector_ = Connector::Create(&pending_connector_request_);
   std::move(callback).Run(std::move(pending_connector_request_),
-                          mojo::MakeRequest(&service_control_));
+                          service_control_.BindNewEndpointAndPassReceiver());
 
   service_->OnStart();
 

services/service_manager/public/cpp/service_binding.h

@@ -11,6 +11,7 @@
 #include "base/callback.h"
 #include "base/component_export.h"
 #include "base/macros.h"
+#include "mojo/public/cpp/bindings/associated_remote.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
 #include "mojo/public/cpp/bindings/pending_receiver.h"
@@ -187,7 +188,7 @@ class COMPONENT_EXPORT(SERVICE_MANAGER_CPP) ServiceBinding
 
   // This instance's control interface to the service manager. Note that this
   // is unbound and therefore invalid until OnStart() is called.
-  mojom::ServiceControlAssociatedPtr service_control_;
+  mojo::AssociatedRemote<mojom::ServiceControl> service_control_;
 
   // Tracks whether |RequestClose()| has been called at least once prior to
   // receiving |OnStart()| on a bound ServiceBinding. This ensures that the

services/service_manager/public/cpp/test/test_connector_factory.cc

@@ -12,6 +12,7 @@
 #include "base/macros.h"
 #include "mojo/public/cpp/bindings/associated_binding.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
+#include "mojo/public/cpp/bindings/pending_associated_receiver.h"
 #include "services/service_manager/public/cpp/service.h"
 #include "services/service_manager/public/mojom/connector.mojom.h"
 #include "services/service_manager/public/mojom/service.mojom.h"
@@ -140,10 +141,10 @@ mojom::ServiceRequest TestConnectorFactory::RegisterInstance(
 
 void TestConnectorFactory::OnStartResponseHandler(
     const std::string& service_name,
-    mojom::ConnectorRequest connector_request,
-    mojom::ServiceControlAssociatedRequest control_request) {
-  impl_->Clone(std::move(connector_request));
-  service_control_bindings_.AddBinding(this, std::move(control_request),
+    mojo::PendingReceiver<mojom::Connector> connector_receiver,
+    mojo::PendingAssociatedReceiver<mojom::ServiceControl> control_receiver) {
+  impl_->Clone(std::move(connector_receiver));
+  service_control_receivers_.Add(this, std::move(control_receiver),
                                  service_name);
 }
 
@@ -151,9 +152,9 @@ void TestConnectorFactory::RequestQuit() {
   if (ignore_quit_requests_)
     return;
 
-  service_proxies_.erase(service_control_bindings_.dispatch_context());
-  service_control_bindings_.RemoveBinding(
-      service_control_bindings_.dispatch_binding());
+  service_proxies_.erase(service_control_receivers_.current_context());
+  service_control_receivers_.Remove(
+      service_control_receivers_.current_receiver());
 }
 
 }  // namespace service_manager

services/service_manager/public/cpp/test/test_connector_factory.h

@@ -11,7 +11,8 @@
 
 #include "base/macros.h"
 #include "base/token.h"
-#include "mojo/public/cpp/bindings/associated_binding_set.h"
+#include "mojo/public/cpp/bindings/associated_receiver_set.h"
+#include "mojo/public/cpp/bindings/pending_associated_receiver.h"
 #include "services/service_manager/public/cpp/connector.h"
 #include "services/service_manager/public/mojom/connector.mojom.h"
 #include "services/service_manager/public/mojom/service_control.mojom.h"
@@ -88,8 +89,8 @@ class TestConnectorFactory : public mojom::ServiceControl {
  private:
   void OnStartResponseHandler(
       const std::string& service_name,
-      mojom::ConnectorRequest connector_request,
-      mojom::ServiceControlAssociatedRequest control_request);
+      mojo::PendingReceiver<mojom::Connector> connector_receiver,
+      mojo::PendingAssociatedReceiver<mojom::ServiceControl> control_receiver);
 
   // mojom::ServiceControl:
   void RequestQuit() override;
@@ -106,8 +107,8 @@ class TestConnectorFactory : public mojom::ServiceControl {
   // ServiceControl bindings which receive and process RequestQuit requests from
   // connected service instances. The associated service name is used as
   // context.
-  mojo::AssociatedBindingSet<mojom::ServiceControl, std::string>
-      service_control_bindings_;
+  mojo::AssociatedReceiverSet<mojom::ServiceControl, std::string>
+      service_control_receivers_;
 
   bool ignore_unknown_service_requests_ = false;
   bool ignore_quit_requests_ = false;

services/service_manager/public/mojom/service.mojom

@@ -48,8 +48,9 @@ interface Service {
   //  control_request
   //    An optional associated ServiceControl request.
   //
-  OnStart(Identity identity) => (Connector&? connector_request,
-                                 associated ServiceControl&? control_request);
+  OnStart(Identity identity) =>
+      (pending_receiver<Connector> connector_receiver,
+       pending_associated_receiver<ServiceControl> control_receiver);
 
   // Called when a request to bind an interface is received from another
   // ("source") service. This is the result of that service calling

services/service_manager/service_instance.cc

@@ -356,16 +356,16 @@ void ServiceInstance::BindServiceManagerReceiver(
 }
 
 void ServiceInstance::OnStartCompleted(
-    mojom::ConnectorRequest connector_request,
-    mojom::ServiceControlAssociatedRequest control_request) {
+    mojo::PendingReceiver<mojom::Connector> connector_receiver,
+    mojo::PendingAssociatedReceiver<mojom::ServiceControl> control_receiver) {
   state_ = mojom::InstanceState::kStarted;
-  if (connector_request.is_pending()) {
-    connector_receivers_.Add(this, std::move(connector_request));
+  if (connector_receiver.is_valid()) {
+    connector_receivers_.Add(this, std::move(connector_receiver));
     connector_receivers_.set_disconnect_handler(base::BindRepeating(
         &ServiceInstance::OnConnectorDisconnected, base::Unretained(this)));
   }
-  if (control_request.is_pending())
-    control_receiver_.Bind(std::move(control_request));
+  if (control_receiver.is_valid())
+    control_receiver_.Bind(std::move(control_receiver));
   service_manager_->NotifyServiceStarted(identity_, pid_);
   MaybeNotifyPidAvailable();
 }

services/service_manager/service_instance.h

@@ -19,6 +19,7 @@
 #include "base/process/process_handle.h"
 #include "build/build_config.h"
 #include "mojo/public/cpp/bindings/associated_receiver.h"
+#include "mojo/public/cpp/bindings/pending_associated_receiver.h"
 #include "mojo/public/cpp/bindings/pending_receiver.h"
 #include "mojo/public/cpp/bindings/receiver.h"
 #include "mojo/public/cpp/bindings/receiver_set.h"
@@ -108,8 +109,9 @@ class ServiceInstance : public mojom::Connector,
   class InterfaceFilter;
   friend class InterfaceFilter;
 
-  void OnStartCompleted(mojom::ConnectorRequest connector_request,
-                        mojom::ServiceControlAssociatedRequest control_request);
+  void OnStartCompleted(
+      mojo::PendingReceiver<mojom::Connector> connector_receiver,
+      mojo::PendingAssociatedReceiver<mojom::ServiceControl> control_receiver);
   void OnConnectRequestAcknowledged();
   void MarkUnreachable();
   void MaybeNotifyPidAvailable();