Clean up old Mojo types for mojom::SystemInfo

This CL cleans up old Mojo types for mojom::SystemInfo from
ServiceLifetimeTestTemplate and AudioServiceLifetimeConnectorTest
using Remote instead of SystemInfoPtr.

Bug: 955171
Change-Id: I9401511be706730e5cae23c02017c3df963be94e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1942684
Commit-Queue: Dave Tapuska <dtapuska@chromium.org>
Reviewed-by: Olga Sharonova <olka@chromium.org>
Reviewed-by: Dave Tapuska <dtapuska@chromium.org>
Cr-Commit-Position: refs/heads/master@{#720484}

services/audio/test/service_lifetime_connector_test.cc

@@ -9,6 +9,7 @@
 #include "build/build_config.h"
 #include "media/audio/mock_audio_manager.h"
 #include "media/audio/test_audio_thread.h"
+#include "mojo/public/cpp/bindings/remote.h"
 #include "services/audio/in_process_audio_manager_accessor.h"
 #include "services/audio/public/mojom/constants.mojom.h"
 #include "services/audio/service.h"
@@ -86,8 +87,8 @@ TEST_F(AudioServiceLifetimeConnectorTest,
   connector_ = connector_factory.CreateConnector();
   task_environment_.RunUntilIdle();
 
-  mojom::SystemInfoPtr info;
-  connector_->BindInterface(mojom::kServiceName, &info);
+  mojo::Remote<mojom::SystemInfo> info;
+  connector_->Connect(mojom::kServiceName, info.BindNewPipeAndPassReceiver());
 
   // Make sure |info| is connected.
   base::RunLoop loop;
@@ -127,8 +128,8 @@ TEST_F(AudioServiceLifetimeConnectorTest,
   connector_ = connector_factory.CreateConnector();
   task_environment_.RunUntilIdle();
 
-  mojom::SystemInfoPtr info;
-  connector_->BindInterface(mojom::kServiceName, &info);
+  mojo::Remote<mojom::SystemInfo> info;
+  connector_->Connect(mojom::kServiceName, info.BindNewPipeAndPassReceiver());
 
   // Make sure |info| is connected.
   base::RunLoop loop;
@@ -156,8 +157,8 @@ TEST_F(AudioServiceLifetimeConnectorTest,
   connector_ = connector_factory.CreateConnector();
   task_environment_.RunUntilIdle();
 
-  mojom::SystemInfoPtr info;
-  connector_->BindInterface(mojom::kServiceName, &info);
+  mojo::Remote<mojom::SystemInfo> info;
+  connector_->Connect(mojom::kServiceName, info.BindNewPipeAndPassReceiver());
 
   // Make sure |info| is connected.
   base::RunLoop loop;
@@ -176,8 +177,8 @@ TEST_F(AudioServiceLifetimeConnectorTest,
 TEST_F(AudioServiceLifetimeConnectorTest, ServiceNotQuitWhenClientConnected) {
   EXPECT_CALL(quit_request_, Run()).Times(Exactly(0));
 
-  mojom::SystemInfoPtr info;
-  connector_->BindInterface(mojom::kServiceName, &info);
+  mojo::Remote<mojom::SystemInfo> info;
+  connector_->Connect(mojom::kServiceName, info.BindNewPipeAndPassReceiver());
   EXPECT_TRUE(info.is_bound());
 
   task_environment_.FastForwardBy(kQuitTimeout * 2);
@@ -186,8 +187,8 @@ TEST_F(AudioServiceLifetimeConnectorTest, ServiceNotQuitWhenClientConnected) {
 
 TEST_F(AudioServiceLifetimeConnectorTest,
        ServiceQuitAfterTimeoutWhenClientDisconnected) {
-  mojom::SystemInfoPtr info;
-  connector_->BindInterface(mojom::kServiceName, &info);
+  mojo::Remote<mojom::SystemInfo> info;
+  connector_->Connect(mojom::kServiceName, info.BindNewPipeAndPassReceiver());
 
   {
     // Make sure the service does not disconnect before a timeout.
@@ -205,14 +206,14 @@ TEST_F(AudioServiceLifetimeConnectorTest,
        ServiceNotQuitWhenAnotherClientQuicklyConnects) {
   EXPECT_CALL(quit_request_, Run()).Times(Exactly(0));
 
-  mojom::SystemInfoPtr info1;
-  connector_->BindInterface(mojom::kServiceName, &info1);
+  mojo::Remote<mojom::SystemInfo> info1;
+  connector_->Connect(mojom::kServiceName, info1.BindNewPipeAndPassReceiver());
   EXPECT_TRUE(info1.is_bound());
 
   info1.reset();
 
-  mojom::SystemInfoPtr info2;
-  connector_->BindInterface(mojom::kServiceName, &info2);
+  mojo::Remote<mojom::SystemInfo> info2;
+  connector_->Connect(mojom::kServiceName, info2.BindNewPipeAndPassReceiver());
   EXPECT_TRUE(info2.is_bound());
 
   task_environment_.FastForwardBy(kQuitTimeout);
@@ -221,14 +222,16 @@ TEST_F(AudioServiceLifetimeConnectorTest,
 
 TEST_F(AudioServiceLifetimeConnectorTest,
        ServiceNotQuitWhenOneClientRemainsConnected) {
-  mojom::SystemInfoPtr info1;
-  mojom::SystemInfoPtr info2;
+  mojo::Remote<mojom::SystemInfo> info1;
+  mojo::Remote<mojom::SystemInfo> info2;
   {
     EXPECT_CALL(quit_request_, Run()).Times(Exactly(0));
 
-    connector_->BindInterface(mojom::kServiceName, &info1);
+    connector_->Connect(mojom::kServiceName,
+                        info1.BindNewPipeAndPassReceiver());
     EXPECT_TRUE(info1.is_bound());
-    connector_->BindInterface(mojom::kServiceName, &info2);
+    connector_->Connect(mojom::kServiceName,
+                        info2.BindNewPipeAndPassReceiver());
     EXPECT_TRUE(info2.is_bound());
 
     task_environment_.FastForwardBy(kQuitTimeout);
@@ -250,17 +253,19 @@ TEST_F(AudioServiceLifetimeConnectorTest,
 
 TEST_F(AudioServiceLifetimeConnectorTest,
        QuitTimeoutIsNotShortenedAfterDelayedReconnect) {
-  mojom::SystemInfoPtr info1;
-  mojom::SystemInfoPtr info2;
+  mojo::Remote<mojom::SystemInfo> info1;
+  mojo::Remote<mojom::SystemInfo> info2;
   {
     EXPECT_CALL(quit_request_, Run()).Times(Exactly(0));
 
-    connector_->BindInterface(mojom::kServiceName, &info1);
+    connector_->Connect(mojom::kServiceName,
+                        info1.BindNewPipeAndPassReceiver());
     EXPECT_TRUE(info1.is_bound());
     info1.reset();
     task_environment_.FastForwardBy(kQuitTimeout * 0.75);
 
-    connector_->BindInterface(mojom::kServiceName, &info2);
+    connector_->Connect(mojom::kServiceName,
+                        info2.BindNewPipeAndPassReceiver());
     EXPECT_TRUE(info2.is_bound());
     info2.reset();
     task_environment_.FastForwardBy(kQuitTimeout * 0.75);

services/audio/test/service_lifetime_test_template.h

@@ -55,12 +55,13 @@ TYPED_TEST_SUITE_P(ServiceLifetimeTestTemplate);
 
 TYPED_TEST_P(ServiceLifetimeTestTemplate,
              DISABLED_ServiceQuitsWhenClientDisconnects) {
-  mojom::SystemInfoPtr info;
+  mojo::Remote<mojom::SystemInfo> info;
   {
     base::RunLoop wait_loop;
     EXPECT_CALL(*this->service_observer_, ServiceStarted())
         .WillOnce(testing::Invoke(&wait_loop, &base::RunLoop::Quit));
-    this->connector()->BindInterface(mojom::kServiceName, &info);
+    this->connector()->Connect(mojom::kServiceName,
+                               info.BindNewPipeAndPassReceiver());
     wait_loop.Run();
   }
   {
@@ -74,12 +75,13 @@ TYPED_TEST_P(ServiceLifetimeTestTemplate,
 
 TYPED_TEST_P(ServiceLifetimeTestTemplate,
              DISABLED_ServiceQuitsWhenLastClientDisconnects) {
-  mojom::SystemInfoPtr info;
+  mojo::Remote<mojom::SystemInfo> info;
   {
     base::RunLoop wait_loop;
     EXPECT_CALL(*this->service_observer_, ServiceStarted())
         .WillOnce(testing::Invoke(&wait_loop, &base::RunLoop::Quit));
-    this->connector()->BindInterface(mojom::kServiceName, &info);
+    this->connector()->Connect(mojom::kServiceName,
+                               info.BindNewPipeAndPassReceiver());
     wait_loop.Run();
   }
   {
@@ -89,12 +91,14 @@ TYPED_TEST_P(ServiceLifetimeTestTemplate,
     EXPECT_CALL(*this->service_observer_, ServiceStarted())
         .Times(testing::Exactly(0));
 
-    mojom::SystemInfoPtr info2;
-    this->connector()->BindInterface(mojom::kServiceName, &info2);
+    mojo::Remote<mojom::SystemInfo> info2;
+    this->connector()->Connect(mojom::kServiceName,
+                               info2.BindNewPipeAndPassReceiver());
     info2.FlushForTesting();
 
-    mojom::SystemInfoPtr info3;
-    this->connector()->BindInterface(mojom::kServiceName, &info3);
+    mojo::Remote<mojom::SystemInfo> info3;
+    this->connector()->Connect(mojom::kServiceName,
+                               info3.BindNewPipeAndPassReceiver());
     info3.FlushForTesting();
 
     info.reset();
@@ -106,12 +110,13 @@ TYPED_TEST_P(ServiceLifetimeTestTemplate,
 
 TYPED_TEST_P(ServiceLifetimeTestTemplate,
              DISABLED_ServiceRestartsWhenClientReconnects) {
-  mojom::SystemInfoPtr info;
+  mojo::Remote<mojom::SystemInfo> info;
   {
     base::RunLoop wait_loop;
     EXPECT_CALL(*this->service_observer_, ServiceStarted())
         .WillOnce(testing::Invoke(&wait_loop, &base::RunLoop::Quit));
-    this->connector()->BindInterface(mojom::kServiceName, &info);
+    this->connector()->Connect(mojom::kServiceName,
+                               info.BindNewPipeAndPassReceiver());
     wait_loop.Run();
   }
   {
@@ -125,7 +130,8 @@ TYPED_TEST_P(ServiceLifetimeTestTemplate,
     base::RunLoop wait_loop;
     EXPECT_CALL(*this->service_observer_, ServiceStarted())
         .WillOnce(testing::Invoke(&wait_loop, &base::RunLoop::Quit));
-    this->connector()->BindInterface(mojom::kServiceName, &info);
+    this->connector()->Connect(mojom::kServiceName,
+                               info.BindNewPipeAndPassReceiver());
     wait_loop.Run();
   }
   {