Clean up old Mojo types uses of DnsConfigChangeManager

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

  - Convert mojom::DnsConfigChangeManagerPtr to
    mojo::PendingRemote|Remote<mojom::DnsConfigChangeManager>
  - Convert mojo::DnsConfigChangeManagerRequest to
    mojo::PendingReceiver<mojom::DnsConfigChangeManager>
  - Convert mojo::Binding to mojo::Receiver

Bug: 955171
Change-Id: Iea32edc6bc502514792114d2adf71cdffb5f8c6a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1896490
Commit-Queue: Gyuyoung Kim <gyuyoung@igalia.com>
Reviewed-by: Ken Rockot <rockot@google.com>
Reviewed-by: David Roger <droger@chromium.org>
Cr-Commit-Position: refs/heads/master@{#712888}

chrome/browser/intranet_redirect_detector.cc

@@ -26,6 +26,7 @@
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/network_service_instance.h"
 #include "content/public/browser/storage_partition.h"
+#include "mojo/public/cpp/bindings/remote.h"
 #include "net/base/load_flags.h"
 #include "net/base/net_errors.h"
 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
@@ -224,10 +225,10 @@ void IntranetRedirectDetector::OnDnsConfigChanged() {
 void IntranetRedirectDetector::SetupDnsConfigClient() {
   DCHECK(!dns_config_client_receiver_.is_bound());
 
-  network::mojom::DnsConfigChangeManagerPtr manager_ptr;
+  mojo::Remote<network::mojom::DnsConfigChangeManager> manager_remote;
   content::GetNetworkService()->GetDnsConfigChangeManager(
-      mojo::MakeRequest(&manager_ptr));
-  manager_ptr->RequestNotifications(
+      manager_remote.BindNewPipeAndPassReceiver());
+  manager_remote->RequestNotifications(
       dns_config_client_receiver_.BindNewPipeAndPassRemote());
   dns_config_client_receiver_.set_disconnect_handler(base::BindRepeating(
       &IntranetRedirectDetector::OnDnsConfigClientConnectionError,

chrome/browser/net/dns_probe_browsertest.cc

@@ -34,6 +34,7 @@
 #include "content/public/test/url_loader_interceptor.h"
 #include "mojo/public/cpp/bindings/pending_receiver.h"
 #include "mojo/public/cpp/bindings/receiver.h"
+#include "mojo/public/cpp/bindings/remote.h"
 #include "net/base/net_errors.h"
 #include "net/dns/mock_host_resolver.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
@@ -386,7 +387,8 @@ class DnsProbeBrowserTest : public InProcessBrowserTest {
     return network_context_.get();
   }
 
-  network::mojom::DnsConfigChangeManagerPtr GetDnsConfigChangeManager();
+  mojo::Remote<network::mojom::DnsConfigChangeManager>
+  GetDnsConfigChangeManager();
 
   std::unique_ptr<FakeHostResolverNetworkContext> network_context_;
   std::unique_ptr<FakeDnsConfigChangeManager> dns_config_change_manager_;
@@ -616,12 +618,13 @@ void DnsProbeBrowserTest::OnDnsProbeStatusSent(
     awaiting_dns_probe_status_run_loop_->Quit();
 }
 
-network::mojom::DnsConfigChangeManagerPtr
+mojo::Remote<network::mojom::DnsConfigChangeManager>
 DnsProbeBrowserTest::GetDnsConfigChangeManager() {
-  network::mojom::DnsConfigChangeManagerPtr dns_config_change_manager_ptr;
+  mojo::Remote<network::mojom::DnsConfigChangeManager>
+      dns_config_change_manager_remote;
   dns_config_change_manager_ = std::make_unique<FakeDnsConfigChangeManager>(
-      mojo::MakeRequest(&dns_config_change_manager_ptr));
-  return dns_config_change_manager_ptr;
+      dns_config_change_manager_remote.BindNewPipeAndPassReceiver());
+  return dns_config_change_manager_remote;
 }
 
 // Test Fixture for tests where the DNS probes should succeed.

chrome/browser/net/dns_probe_service_factory.cc

@@ -23,6 +23,7 @@
 #include "content/public/browser/network_service_instance.h"
 #include "content/public/browser/storage_partition.h"
 #include "mojo/public/cpp/bindings/receiver.h"
+#include "mojo/public/cpp/bindings/remote.h"
 #include "net/base/ip_address.h"
 #include "net/base/ip_endpoint.h"
 #include "net/dns/public/dns_protocol.h"
@@ -90,11 +91,13 @@ network::mojom::NetworkContext* GetNetworkContextForProfile(
       ->GetNetworkContext();
 }
 
-network::mojom::DnsConfigChangeManagerPtr GetDnsConfigChangeManager() {
-  network::mojom::DnsConfigChangeManagerPtr dns_config_change_manager_ptr;
+mojo::Remote<network::mojom::DnsConfigChangeManager>
+GetDnsConfigChangeManager() {
+  mojo::Remote<network::mojom::DnsConfigChangeManager>
+      dns_config_change_manager_remote;
   content::GetNetworkService()->GetDnsConfigChangeManager(
-      mojo::MakeRequest(&dns_config_change_manager_ptr));
-  return dns_config_change_manager_ptr;
+      dns_config_change_manager_remote.BindNewPipeAndPassReceiver());
+  return dns_config_change_manager_remote;
 }
 
 net::DnsConfigOverrides SystemOverrides() {

chrome/browser/net/dns_probe_service_factory.h

@@ -11,6 +11,7 @@
 #include "base/memory/singleton.h"
 #include "base/time/tick_clock.h"
 #include "components/keyed_service/content/browser_context_keyed_service_factory.h"
+#include "mojo/public/cpp/bindings/remote.h"
 #include "services/network/public/mojom/host_resolver.mojom.h"
 
 class KeyedService;
@@ -33,8 +34,8 @@ class DnsProbeServiceFactory : public BrowserContextKeyedServiceFactory {
  public:
   using NetworkContextGetter =
       base::RepeatingCallback<network::mojom::NetworkContext*(void)>;
-  using DnsConfigChangeManagerGetter =
-      base::RepeatingCallback<network::mojom::DnsConfigChangeManagerPtr(void)>;
+  using DnsConfigChangeManagerGetter = base::RepeatingCallback<
+      mojo::Remote<network::mojom::DnsConfigChangeManager>(void)>;
 
   // Returns the DnsProbeService that supports NetworkContexts for
   // |browser_context|.

chrome/browser/net/dns_probe_service_factory_unittest.cc

@@ -18,6 +18,7 @@
 #include "chrome/browser/net/dns_probe_test_util.h"
 #include "components/error_page/common/net_error_info.h"
 #include "content/public/test/browser_task_environment.h"
+#include "mojo/public/cpp/bindings/remote.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using base::RunLoop;
@@ -45,11 +46,13 @@ class DnsProbeServiceTest : public testing::Test {
     return network_context_.get();
   }
 
-  network::mojom::DnsConfigChangeManagerPtr GetDnsConfigChangeManager() {
-    network::mojom::DnsConfigChangeManagerPtr dns_config_change_manager_ptr;
+  mojo::Remote<network::mojom::DnsConfigChangeManager>
+  GetDnsConfigChangeManager() {
+    mojo::Remote<network::mojom::DnsConfigChangeManager>
+        dns_config_change_manager_remote;
     dns_config_change_manager_ = std::make_unique<FakeDnsConfigChangeManager>(
-        mojo::MakeRequest(&dns_config_change_manager_ptr));
-    return dns_config_change_manager_ptr;
+        dns_config_change_manager_remote.BindNewPipeAndPassReceiver());
+    return dns_config_change_manager_remote;
   }
 
   void ConfigureTest(

chrome/browser/net/dns_probe_test_util.cc

@@ -120,8 +120,8 @@ void FakeHostResolverNetworkContext::CreateHostResolver(
 }
 
 FakeDnsConfigChangeManager::FakeDnsConfigChangeManager(
-    network::mojom::DnsConfigChangeManagerRequest request)
-    : binding_(this, std::move(request)) {}
+    mojo::PendingReceiver<network::mojom::DnsConfigChangeManager> receiver)
+    : receiver_(this, std::move(receiver)) {}
 
 FakeDnsConfigChangeManager::~FakeDnsConfigChangeManager() = default;
 

chrome/browser/net/dns_probe_test_util.h

@@ -8,7 +8,6 @@
 #include <memory>
 #include <vector>
 
-#include "mojo/public/cpp/bindings/binding.h"
 #include "mojo/public/cpp/bindings/pending_receiver.h"
 #include "mojo/public/cpp/bindings/pending_remote.h"
 #include "mojo/public/cpp/bindings/receiver.h"
@@ -106,7 +105,7 @@ class FakeDnsConfigChangeManager
     : public network::mojom::DnsConfigChangeManager {
  public:
   explicit FakeDnsConfigChangeManager(
-      network::mojom::DnsConfigChangeManagerRequest request);
+      mojo::PendingReceiver<network::mojom::DnsConfigChangeManager> receiver);
   ~FakeDnsConfigChangeManager() override;
 
   // mojom::DnsConfigChangeManager implementation:
@@ -117,7 +116,7 @@ class FakeDnsConfigChangeManager
   void SimulateDnsConfigChange();
 
  private:
-  mojo::Binding<network::mojom::DnsConfigChangeManager> binding_;
+  mojo::Receiver<network::mojom::DnsConfigChangeManager> receiver_;
   mojo::Remote<network::mojom::DnsConfigChangeManagerClient> client_;
 };
 

services/network/network_service_unittest.cc

@@ -1282,11 +1282,12 @@ TEST_F(NetworkServiceTestWithService,
 }
 
 TEST_F(NetworkServiceTestWithService, GetDnsConfigChangeManager) {
-  mojom::DnsConfigChangeManagerPtr ptr;
-  ASSERT_FALSE(ptr.is_bound());
+  mojo::Remote<mojom::DnsConfigChangeManager> remote;
+  ASSERT_FALSE(remote.is_bound());
 
-  network_service_->GetDnsConfigChangeManager(mojo::MakeRequest(&ptr));
-  EXPECT_TRUE(ptr.is_bound());
+  network_service_->GetDnsConfigChangeManager(
+      remote.BindNewPipeAndPassReceiver());
+  EXPECT_TRUE(remote.is_bound());
 }
 
 TEST_F(NetworkServiceTestWithService, GetNetworkList) {