Use new mojo types for service_manager.mojom

This CL converts ServiceManagerPtr and port depending files to adapt to
new mojo types.

Bug: 955171, 978694
Change-Id: I8391cdf9995d2395776e115baeaa2d6315fc1183
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1893592
Reviewed-by: Ken Rockot <rockot@google.com>
Commit-Queue: Abhijeet Kandalkar <abhijeet@igalia.com>
Cr-Commit-Position: refs/heads/master@{#711995}

services/service_manager/tests/lifecycle/lifecycle_unittest.cc

@@ -17,6 +17,7 @@
 #include "base/test/task_environment.h"
 #include "build/build_config.h"
 #include "mojo/public/cpp/bindings/binding.h"
+#include "mojo/public/cpp/bindings/remote.h"
 #include "services/service_manager/public/cpp/constants.h"
 #include "services/service_manager/public/cpp/identity.h"
 #include "services/service_manager/public/cpp/manifest.h"
@@ -243,9 +244,9 @@ class LifecycleTest : public testing::Test {
 
  private:
   std::unique_ptr<InstanceState> TrackInstances() {
-    mojom::ServiceManagerPtr service_manager;
-    connector()->BindInterface(service_manager::mojom::kServiceName,
-                               &service_manager);
+    mojo::Remote<mojom::ServiceManager> service_manager;
+    connector()->Connect(service_manager::mojom::kServiceName,
+                         service_manager.BindNewPipeAndPassReceiver());
     mojo::PendingRemote<mojom::ServiceManagerListener> listener;
     base::RunLoop loop;
     InstanceState* state = new InstanceState(

services/service_manager/tests/service_manager/service_manager_listener_unittest.cc

@@ -114,8 +114,9 @@ class ServiceManagerListenerTest : public testing::Test, public Service {
     service_binding_.Bind(
         RegisterServiceInstance(kTestServiceName, kTestSelfPid));
 
-    mojom::ServiceManagerPtr service_manager;
-    connector()->BindInterface(mojom::kServiceName, &service_manager);
+    mojo::Remote<mojom::ServiceManager> service_manager;
+    connector()->Connect(mojom::kServiceName,
+                         service_manager.BindNewPipeAndPassReceiver());
 
     mojo::PendingRemote<mojom::ServiceManagerListener> listener_proxy;
     listener_ = std::make_unique<TestListener>(

services/service_manager/tests/service_manager/service_manager_unittest.cc

@@ -169,9 +169,9 @@ class ServiceManagerTest : public testing::Test,
   Connector* connector() { return test_service_.connector(); }
 
   void AddListenerAndWaitForApplications() {
-    mojom::ServiceManagerPtr service_manager;
-    connector()->BindInterface(service_manager::mojom::kServiceName,
-                               &service_manager);
+    mojo::Remote<mojom::ServiceManager> service_manager;
+    connector()->Connect(service_manager::mojom::kServiceName,
+                         service_manager.BindNewPipeAndPassReceiver());
 
     mojo::PendingRemote<mojom::ServiceManagerListener> listener;
     binding_.Bind(listener.InitWithNewPipeAndPassReceiver());