Migrate old Mojo types of Connector interface to new Mojo types

This CL converts old Mojo types of Connector interface to new Mojo types.
Major changes are as below,

  - Rename BindConnectorRequest to BindConnectorReceiver
  - Apply mojo::PendingReceiver to Connector::Create
  - Convert FooRequest to mojo::PendingReceiver
  - Convert FooPtr to mojo::PendingRemote or mojo::Remote

Bug: 955171
Change-Id: I51bfc5611f421f1754c3bda98b67d0d44b08745b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1887250
Commit-Queue: Gyuyoung Kim <gyuyoung@igalia.com>
Reviewed-by: Maksim Ivanov <emaxx@chromium.org>
Reviewed-by: Scott Violet <sky@chromium.org>
Reviewed-by: Ken Rockot <rockot@google.com>
Cr-Commit-Position: refs/heads/master@{#711631}

ash/multi_device_setup/multi_device_notification_presenter_unittest.cc

@@ -21,6 +21,7 @@
 #include "chromeos/services/multidevice_setup/public/cpp/fake_multidevice_setup.h"
 #include "chromeos/services/multidevice_setup/public/mojom/constants.mojom.h"
 #include "chromeos/services/multidevice_setup/public/mojom/multidevice_setup.mojom.h"
+#include "mojo/public/cpp/bindings/pending_receiver.h"
 #include "services/service_manager/public/cpp/connector.h"
 #include "services/service_manager/public/mojom/connector.mojom.h"
 #include "ui/base/l10n/l10n_util.h"
@@ -101,8 +102,8 @@ class MultiDeviceNotificationPresenterTest : public NoSessionAshTestBase {
 
     test_system_tray_client_ = GetSystemTrayClient();
 
-    service_manager::mojom::ConnectorRequest request;
-    connector_ = service_manager::Connector::Create(&request);
+    mojo::PendingReceiver<service_manager::mojom::Connector> receiver;
+    connector_ = service_manager::Connector::Create(&receiver);
 
     fake_multidevice_setup_ =
         std::make_unique<chromeos::multidevice_setup::FakeMultiDeviceSetup>();

chrome/browser/chromeos/apps/apk_web_app_installer.cc

@@ -18,6 +18,7 @@
 #include "chrome/browser/web_applications/web_app_provider.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/system_connector.h"
+#include "mojo/public/cpp/bindings/pending_receiver.h"
 #include "services/data_decoder/public/cpp/decode_image.h"
 #include "services/service_manager/public/cpp/connector.h"
 #include "third_party/blink/public/mojom/manifest/display_mode.mojom.h"
@@ -98,9 +99,9 @@ void ApkWebAppInstaller::Start(service_manager::Connector* connector,
 
   // Set up the connection to the service manager to decode the raw PNG icon
   // bytes into SkBitmaps.
-  service_manager::mojom::ConnectorRequest connector_request;
-  connector_ = service_manager::Connector::Create(&connector_request);
-  connector->BindConnectorRequest(std::move(connector_request));
+  mojo::PendingReceiver<service_manager::mojom::Connector> connector_receiver;
+  connector_ = service_manager::Connector::Create(&connector_receiver);
+  connector->BindConnectorReceiver(std::move(connector_receiver));
 
   // Decode the image in a sandboxed process off the main thread.
   // base::Unretained is safe because this object owns itself.

chrome/browser/extensions/system_display/display_info_provider_chromeos_unittest.cc

@@ -69,8 +69,8 @@ class DisplayInfoProviderChromeosTest : public ChromeAshTestBase {
 
     // Create a local service manager connector to handle requests to
     // ash::mojom::CrosDisplayConfigController.
-    service_manager::mojom::ConnectorRequest request;
-    connector_ = service_manager::Connector::Create(&request);
+    mojo::PendingReceiver<service_manager::mojom::Connector> receiver;
+    connector_ = service_manager::Connector::Create(&receiver);
     service_manager::Connector::TestApi test_api(connector_.get());
     test_api.OverrideBinderForTesting(
         service_manager::ServiceFilter::ByName(ash::mojom::kServiceName),

chrome/browser/image_decoder.cc

@@ -38,9 +38,10 @@ void OnDecodeImageDone(
     fail_callback.Run(request_id);
 }
 
-void BindToBrowserConnector(service_manager::mojom::ConnectorRequest request) {
+void BindToBrowserConnector(
+    mojo::PendingReceiver<service_manager::mojom::Connector> receiver) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
-  content::GetSystemConnector()->BindConnectorRequest(std::move(request));
+  content::GetSystemConnector()->BindConnectorReceiver(std::move(receiver));
 }
 
 void RunDecodeCallbackOnTaskRunner(
@@ -59,12 +60,12 @@ void DecodeImage(
     scoped_refptr<base::SequencedTaskRunner> callback_task_runner) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
 
-  service_manager::mojom::ConnectorRequest connector_request;
+  mojo::PendingReceiver<service_manager::mojom::Connector> connector_receiver;
   std::unique_ptr<service_manager::Connector> connector =
-      service_manager::Connector::Create(&connector_request);
+      service_manager::Connector::Create(&connector_receiver);
   base::PostTask(
       FROM_HERE, {content::BrowserThread::UI},
-      base::BindOnce(&BindToBrowserConnector, std::move(connector_request)));
+      base::BindOnce(&BindToBrowserConnector, std::move(connector_receiver)));
 
   data_decoder::DecodeImage(
       connector.get(), image_data, codec, shrink_to_fit, kMaxImageSizeInBytes,

chrome/browser/media/cast_transport_host_filter.cc

@@ -17,6 +17,7 @@
 #include "media/cast/net/cast_transport.h"
 #include "media/cast/net/udp_transport_impl.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
+#include "mojo/public/cpp/bindings/pending_receiver.h"
 #include "services/device/public/mojom/constants.mojom.h"
 #include "services/device/public/mojom/wake_lock_provider.mojom.h"
 #include "services/service_manager/public/cpp/connector.h"
@@ -106,11 +107,12 @@ class RtcpClient : public media::cast::RtcpObserver {
   DISALLOW_COPY_AND_ASSIGN(RtcpClient);
 };
 
-void CastBindConnectorRequest(
-    service_manager::mojom::ConnectorRequest connector_request) {
+void CastBindConnectorReceiver(
+    mojo::PendingReceiver<service_manager::mojom::Connector>
+        connector_receiver) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
-  content::GetSystemConnector()->BindConnectorRequest(
-      std::move(connector_request));
+  content::GetSystemConnector()->BindConnectorReceiver(
+      std::move(connector_receiver));
 }
 
 }  // namespace
@@ -399,11 +401,11 @@ device::mojom::WakeLock* CastTransportHostFilter::GetWakeLock() {
   if (wake_lock_)
     return wake_lock_.get();
 
-  service_manager::mojom::ConnectorRequest connector_request;
-  auto connector = service_manager::Connector::Create(&connector_request);
-  base::PostTask(
-      FROM_HERE, {content::BrowserThread::UI},
-      base::BindOnce(&CastBindConnectorRequest, std::move(connector_request)));
+  mojo::PendingReceiver<service_manager::mojom::Connector> connector_receiver;
+  auto connector = service_manager::Connector::Create(&connector_receiver);
+  base::PostTask(FROM_HERE, {content::BrowserThread::UI},
+                 base::BindOnce(&CastBindConnectorReceiver,
+                                std::move(connector_receiver)));
 
   mojo::Remote<device::mojom::WakeLockProvider> wake_lock_provider;
   connector->Connect(device::mojom::kServiceName,

chrome/browser/prefs/profile_pref_store_manager_unittest.cc

@@ -354,7 +354,6 @@ class ProfilePrefStoreManagerTest : public testing::Test,
 
   base::test::ScopedFeatureList feature_list_;
   bool reset_recorded_;
-  service_manager::mojom::ConnectorRequest connector_request_;
   mojo::ReceiverSet<prefs::mojom::ResetOnLoadObserver>
       reset_on_load_observer_receivers_;
 };

chrome/browser/renderer_host/pepper/pepper_flash_browser_host.cc

@@ -19,6 +19,7 @@
 #include "content/public/browser/system_connector.h"
 #include "ipc/ipc_message_macros.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
+#include "mojo/public/cpp/bindings/pending_receiver.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/c/private/ppb_flash.h"
 #include "ppapi/host/dispatch_host_message.h"
@@ -56,12 +57,13 @@ scoped_refptr<content_settings::CookieSettings> GetCookieSettings(
   return nullptr;
 }
 
-void PepperBindConnectorRequest(
-    service_manager::mojom::ConnectorRequest connector_request) {
+void PepperBindConnectorReceiver(
+    mojo::PendingReceiver<service_manager::mojom::Connector>
+        connector_receiver) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   DCHECK(content::GetSystemConnector());
-  content::GetSystemConnector()->BindConnectorRequest(
-      std::move(connector_request));
+  content::GetSystemConnector()->BindConnectorReceiver(
+      std::move(connector_receiver));
 }
 
 }  // namespace
@@ -184,15 +186,15 @@ device::mojom::WakeLock* PepperFlashBrowserHost::GetWakeLock() {
   if (!content::GetSystemConnector())
     return wake_lock_.get();
 
-  service_manager::mojom::ConnectorRequest connector_request;
-  auto connector = service_manager::Connector::Create(&connector_request);
+  mojo::PendingReceiver<service_manager::mojom::Connector> connector_receiver;
+  auto connector = service_manager::Connector::Create(&connector_receiver);
 
   // The existing connector is bound to the UI thread, the current thread is
-  // IO thread. So bind the ConnectorRequest of IO thread to the connector
+  // IO thread. So bind the Connector receiver of IO thread to the connector
   // in UI thread.
   base::PostTask(FROM_HERE, {BrowserThread::UI},
-                 base::BindOnce(&PepperBindConnectorRequest,
-                                std::move(connector_request)));
+                 base::BindOnce(&PepperBindConnectorReceiver,
+                                std::move(connector_receiver)));
 
   mojo::Remote<device::mojom::WakeLockProvider> wake_lock_provider;
   connector->Connect(device::mojom::kServiceName,

chrome/browser/resource_coordinator/local_site_characteristics_data_unittest_utils.cc

@@ -17,6 +17,7 @@
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/system_connector.h"
 #include "content/public/browser/web_contents.h"
+#include "mojo/public/cpp/bindings/pending_receiver.h"
 
 namespace resource_coordinator {
 namespace testing {
@@ -111,9 +112,9 @@ void ChromeTestHarnessWithLocalDB::SetUp() {
   LocalSiteCharacteristicsDataStoreFactory::EnableForTesting();
 
   // TODO(siggi): Can this die now?
-  service_manager::mojom::ConnectorRequest connector_request;
+  mojo::PendingReceiver<service_manager::mojom::Connector> connector_receiver;
   content::SetSystemConnectorForTesting(
-      service_manager::Connector::Create(&connector_request));
+      service_manager::Connector::Create(&connector_receiver));
   ChromeRenderViewHostTestHarness::SetUp();
 }
 

chromecast/external_mojo/external_service_support/chromium_service.cc

@@ -13,6 +13,7 @@
 #include "mojo/public/cpp/bindings/interface_request.h"
 #include "mojo/public/cpp/bindings/pending_associated_receiver.h"
 #include "mojo/public/cpp/bindings/pending_receiver.h"
+#include "mojo/public/cpp/bindings/remote.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"
@@ -87,9 +88,9 @@ std::unique_ptr<service_manager::Connector> CreateChromiumConnector(
   mojo::MessagePipe pipe;
   connector->SendChromiumConnectorRequest(std::move(pipe.handle1));
   return std::make_unique<service_manager::Connector>(
-      service_manager::mojom::ConnectorPtr(
-          service_manager::mojom::ConnectorPtrInfo(std::move(pipe.handle0),
-                                                   0)));
+      mojo::Remote<service_manager::mojom::Connector>(
+          mojo::PendingRemote<service_manager::mojom::Connector>(
+              std::move(pipe.handle0), 0)));
 }
 
 }  // namespace external_service_support

chromecast/external_mojo/public/cpp/external_mojo_broker.cc

@@ -291,8 +291,9 @@ class ExternalMojoBroker::ConnectorImpl : public mojom::ExternalConnector {
       return;
     }
 
-    connector_->BindConnectorRequest(
-        service_manager::mojom::ConnectorRequest(std::move(interface_pipe)));
+    connector_->BindConnectorReceiver(
+        mojo::PendingReceiver<service_manager::mojom::Connector>(
+            std::move(interface_pipe)));
   }
 
   void QueryServiceList(QueryServiceListCallback callback) override {

chromecast/media/audio/cast_audio_manager.cc

@@ -270,18 +270,18 @@ void CastAudioManager::SetConnectorForTesting(
 
 service_manager::Connector* CastAudioManager::GetConnector() {
   if (!connector_) {
-    service_manager::mojom::ConnectorRequest request;
-    connector_ = service_manager::Connector::Create(&request);
+    mojo::PendingReceiver<service_manager::mojom::Connector> receiver;
+    connector_ = service_manager::Connector::Create(&receiver);
     browser_task_runner_->PostTask(
-        FROM_HERE, base::BindOnce(&CastAudioManager::BindConnectorRequest,
-                                  weak_this_, std::move(request)));
+        FROM_HERE, base::BindOnce(&CastAudioManager::BindConnectorReceiver,
+                                  weak_this_, std::move(receiver)));
   }
   return connector_.get();
 }
 
-void CastAudioManager::BindConnectorRequest(
-    service_manager::mojom::ConnectorRequest request) {
-  browser_connector_->BindConnectorRequest(std::move(request));
+void CastAudioManager::BindConnectorReceiver(
+    mojo::PendingReceiver<service_manager::mojom::Connector> receiver) {
+  browser_connector_->BindConnectorReceiver(std::move(receiver));
 }
 
 bool CastAudioManager::UseMixerOutputStream(

chromecast/media/audio/cast_audio_manager.h

@@ -13,6 +13,7 @@
 #include "base/single_thread_task_runner.h"
 #include "build/build_config.h"
 #include "media/audio/audio_manager_base.h"
+#include "mojo/public/cpp/bindings/pending_receiver.h"
 #include "services/service_manager/public/cpp/connector.h"
 
 // NOTE: CastAudioManager receives a |device_id| from the audio service, and
@@ -120,7 +121,8 @@ class CastAudioManager : public ::media::AudioManagerBase {
   friend class CastAudioManagerTest;
   friend class CastAudioOutputStreamTest;
   service_manager::Connector* GetConnector();
-  void BindConnectorRequest(service_manager::mojom::ConnectorRequest request);
+  void BindConnectorReceiver(
+      mojo::PendingReceiver<service_manager::mojom::Connector> receiver);
 
   CastAudioManager(
       std::unique_ptr<::media::AudioThread> audio_thread,

chromecast/media/audio/cast_audio_manager_alsa_unittest.cc

@@ -13,6 +13,7 @@
 #include "chromecast/media/cma/test/mock_cma_backend_factory.h"
 #include "media/audio/fake_audio_log_factory.h"
 #include "media/audio/test_audio_thread.h"
+#include "mojo/public/cpp/bindings/pending_receiver.h"
 #include "services/service_manager/public/cpp/connector.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -31,8 +32,8 @@ const ::media::AudioParameters kDefaultAudioParams(
 void OnLogMessage(const std::string& message) {}
 
 std::unique_ptr<service_manager::Connector> CreateConnector() {
-  service_manager::mojom::ConnectorRequest request;
-  return service_manager::Connector::Create(&request);
+  mojo::PendingReceiver<service_manager::mojom::Connector> receiver;
+  return service_manager::Connector::Create(&receiver);
 }
 
 std::string DummyGetSessionId(std::string /* audio_group_id */) {

chromecast/media/audio/cast_audio_manager_unittest.cc

@@ -22,6 +22,7 @@
 #include "media/audio/fake_audio_log_factory.h"
 #include "media/audio/mock_audio_source_callback.h"
 #include "media/audio/test_audio_thread.h"
+#include "mojo/public/cpp/bindings/pending_receiver.h"
 #include "services/service_manager/public/cpp/connector.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -51,8 +52,8 @@ const ::media::AudioParameters kAudioParamsInvalidLayout(
     256);
 
 std::unique_ptr<service_manager::Connector> CreateConnector() {
-  service_manager::mojom::ConnectorRequest request;
-  return service_manager::Connector::Create(&request);
+  mojo::PendingReceiver<service_manager::mojom::Connector> receiver;
+  return service_manager::Connector::Create(&receiver);
 }
 
 int OnMoreData(base::TimeDelta delay,

chromecast/media/audio/cast_audio_mixer_unittest.cc

@@ -19,15 +19,16 @@
 #include "chromecast/media/cma/backend/cma_backend_factory.h"
 #include "media/audio/audio_io.h"
 #include "media/audio/test_audio_thread.h"
+#include "mojo/public/cpp/bindings/pending_receiver.h"
 #include "services/service_manager/public/cpp/connector.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
 std::unique_ptr<service_manager::Connector> CreateConnector() {
-  service_manager::mojom::ConnectorRequest request;
-  return service_manager::Connector::Create(&request);
+  mojo::PendingReceiver<service_manager::mojom::Connector> receiver;
+  return service_manager::Connector::Create(&receiver);
 }
 
 std::string DummyGetSessionId(std::string /* audio_group_id */) {

chromecast/media/audio/cast_audio_output_stream_unittest.cc

@@ -31,6 +31,7 @@
 #include "media/audio/mock_audio_source_callback.h"
 #include "media/audio/test_audio_thread.h"
 #include "mojo/public/cpp/bindings/binding.h"
+#include "mojo/public/cpp/bindings/pending_receiver.h"
 #include "services/service_manager/public/cpp/connector.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -42,8 +43,8 @@ using testing::NiceMock;
 namespace {
 
 std::unique_ptr<service_manager::Connector> CreateConnector() {
-  service_manager::mojom::ConnectorRequest request;
-  return service_manager::Connector::Create(&request);
+  mojo::PendingReceiver<service_manager::mojom::Connector> receiver;
+  return service_manager::Connector::Create(&receiver);
 }
 
 std::string DummyGetSessionId(std::string /* audio_group_id */) {

components/language/content/browser/geo_language_model_unittest.cc

@@ -12,6 +12,7 @@
 #include "components/language/content/browser/test_utils.h"
 #include "components/language/content/browser/ulp_language_code_locator/ulp_language_code_locator.h"
 #include "components/prefs/testing_pref_service.h"
+#include "mojo/public/cpp/bindings/pending_receiver.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -33,8 +34,8 @@ class GeoLanguageModelTest : public testing::Test {
       : geo_language_provider_(task_environment_.GetMainThreadTaskRunner()),
         geo_language_model_(&geo_language_provider_),
         mock_ip_geo_location_provider_(&mock_geo_location_) {
-    service_manager::mojom::ConnectorRequest request;
-    connector_ = service_manager::Connector::Create(&request);
+    mojo::PendingReceiver<service_manager::mojom::Connector> receiver;
+    connector_ = service_manager::Connector::Create(&receiver);
     connector_->OverrideBinderForTesting(
         service_manager::ServiceFilter::ByName(device::mojom::kServiceName),
         device::mojom::PublicIpAddressGeolocationProvider::Name_,

components/language/content/browser/geo_language_provider_unittest.cc

@@ -18,6 +18,7 @@
 #include "components/language/content/browser/ulp_language_code_locator/ulp_language_code_locator.h"
 #include "components/language/core/common/language_experiments.h"
 #include "components/prefs/testing_pref_service.h"
+#include "mojo/public/cpp/bindings/pending_receiver.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace language {
@@ -27,8 +28,8 @@ class GeoLanguageProviderTest : public testing::Test {
   GeoLanguageProviderTest()
       : geo_language_provider_(task_environment_.GetMainThreadTaskRunner()),
         mock_ip_geo_location_provider_(&mock_geo_location_) {
-    service_manager::mojom::ConnectorRequest request;
-    connector_ = service_manager::Connector::Create(&request);
+    mojo::PendingReceiver<service_manager::mojom::Connector> receiver;
+    connector_ = service_manager::Connector::Create(&receiver);
     connector_->OverrideBinderForTesting(
         service_manager::ServiceFilter::ByName(device::mojom::kServiceName),
         device::mojom::PublicIpAddressGeolocationProvider::Name_,