Clean up old Mojo types for network::mojom::DhcpWpadUrlClient

This CL cleans up old Mojo types for
network::mojom::DhcpWpadUrlClient using PendingRemote instead of
DhcpWpadUrlClientPtr.

Bug: 955171
Change-Id: Ib212551349dfc1d1519ebc987305e41577c52434
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1943785
Commit-Queue: Dave Tapuska <dtapuska@chromium.org>
Reviewed-by: Matt Falkenhagen <falken@chromium.org>
Reviewed-by: Dave Tapuska <dtapuska@chromium.org>
Cr-Commit-Position: refs/heads/master@{#720474}

services/network/dhcp_pac_file_fetcher_mojo.cc

@@ -14,11 +14,12 @@ namespace network {
 
 DhcpPacFileFetcherMojo::DhcpPacFileFetcherMojo(
     net::URLRequestContext* url_request_context,
-    network::mojom::DhcpWpadUrlClientPtr dhcp_wpad_url_client) {
+    mojo::PendingRemote<network::mojom::DhcpWpadUrlClient>
+        dhcp_wpad_url_client) {
   DCHECK(url_request_context);
   CHECK(dhcp_wpad_url_client) << "DhcpWpadUrlClient not set.";
   pac_file_fetcher_ = net::PacFileFetcherImpl::Create(url_request_context);
-  dhcp_wpad_url_client_ = std::move(dhcp_wpad_url_client);
+  dhcp_wpad_url_client_.Bind(std::move(dhcp_wpad_url_client));
 }
 
 DhcpPacFileFetcherMojo::~DhcpPacFileFetcherMojo() = default;

services/network/dhcp_pac_file_fetcher_mojo.h

@@ -11,6 +11,7 @@
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
+#include "mojo/public/cpp/bindings/pending_remote.h"
 #include "mojo/public/cpp/bindings/remote.h"
 #include "net/base/completion_once_callback.h"
 #include "net/proxy_resolution/dhcp_pac_file_fetcher.h"
@@ -33,9 +34,9 @@ namespace network {
 class COMPONENT_EXPORT(NETWORK_SERVICE) DhcpPacFileFetcherMojo
     : public net::DhcpPacFileFetcher {
  public:
-  DhcpPacFileFetcherMojo(
-      net::URLRequestContext* url_request_context,
-      network::mojom::DhcpWpadUrlClientPtr dhcp_wpad_url_client);
+  DhcpPacFileFetcherMojo(net::URLRequestContext* url_request_context,
+                         mojo::PendingRemote<network::mojom::DhcpWpadUrlClient>
+                             dhcp_wpad_url_client);
 
   ~DhcpPacFileFetcherMojo() override;
 
@@ -64,7 +65,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) DhcpPacFileFetcherMojo
   GURL pac_url_;
   net::MutableNetworkTrafficAnnotationTag traffic_annotation_;
   std::unique_ptr<net::PacFileFetcher> pac_file_fetcher_;
-  network::mojom::DhcpWpadUrlClientPtr dhcp_wpad_url_client_;
+  mojo::Remote<network::mojom::DhcpWpadUrlClient> dhcp_wpad_url_client_;
 
   base::WeakPtrFactory<DhcpPacFileFetcherMojo> weak_ptr_factory_{this};
 
@@ -73,4 +74,4 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) DhcpPacFileFetcherMojo
 
 }  // namespace network
 
-#endif  // SERVICES_NETWORK_DHCP_PAC_FILE_FETCHER_MOJO_H_
\ No newline at end of file
+#endif  // SERVICES_NETWORK_DHCP_PAC_FILE_FETCHER_MOJO_H_

services/network/dhcp_pac_file_fetcher_mojo_unittest.cc

@@ -31,9 +31,8 @@ class DhcpPacFileFetcherMojoTest : public testing::Test {
     net::TestURLRequestContext context;
     dhcp_pac_file_fetcher_mojo_ = std::make_unique<DhcpPacFileFetcherMojo>(
         &context,
-        network::mojom::DhcpWpadUrlClientPtr(
-            network::MockMojoDhcpWpadUrlClient::CreateWithSelfOwnedReceiver(
-                pac_url)));
+        network::MockMojoDhcpWpadUrlClient::CreateWithSelfOwnedReceiver(
+            pac_url));
     mock_pac_file_fetcher_ = new net::MockPacFileFetcher();
     dhcp_pac_file_fetcher_mojo_->SetPacFileFetcherForTesting(
         base::WrapUnique(mock_pac_file_fetcher_));

services/network/network_context.cc

@@ -1800,8 +1800,7 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
 
 #if defined(OS_CHROMEOS)
   if (params_->dhcp_wpad_url_client) {
-    builder.SetDhcpWpadUrlClient(network::mojom::DhcpWpadUrlClientPtr(
-        std::move(params_->dhcp_wpad_url_client)));
+    builder.SetDhcpWpadUrlClient(std::move(params_->dhcp_wpad_url_client));
   }
 #endif  // defined(OS_CHROMEOS)
 

services/network/url_request_context_builder_mojo.cc

@@ -31,7 +31,8 @@ void URLRequestContextBuilderMojo::SetMojoProxyResolverFactory(
 
 #if defined(OS_CHROMEOS)
 void URLRequestContextBuilderMojo::SetDhcpWpadUrlClient(
-    network::mojom::DhcpWpadUrlClientPtr dhcp_wpad_url_client) {
+    mojo::PendingRemote<network::mojom::DhcpWpadUrlClient>
+        dhcp_wpad_url_client) {
   dhcp_wpad_url_client_ = std::move(dhcp_wpad_url_client);
 }
 #endif  // defined(OS_CHROMEOS)

services/network/url_request_context_builder_mojo.h

@@ -48,7 +48,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) URLRequestContextBuilderMojo
 
 #if defined(OS_CHROMEOS)
   void SetDhcpWpadUrlClient(
-      network::mojom::DhcpWpadUrlClientPtr dhcp_wpad_url_client);
+      mojo::PendingRemote<network::mojom::DhcpWpadUrlClient>
+          dhcp_wpad_url_client);
 #endif  // defined(OS_CHROMEOS)
 
  private:
@@ -65,7 +66,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) URLRequestContextBuilderMojo
 #if defined(OS_CHROMEOS)
   // If set, handles calls to get the PAC script URL from the browser process.
   // Only used if |mojo_proxy_resolver_factory_| is set.
-  network::mojom::DhcpWpadUrlClientPtr dhcp_wpad_url_client_;
+  mojo::PendingRemote<network::mojom::DhcpWpadUrlClient> dhcp_wpad_url_client_;
 #endif  // defined(OS_CHROMEOS)
 
   mojo::PendingRemote<proxy_resolver::mojom::ProxyResolverFactory>

services/network/url_request_context_builder_mojo_unittest.cc

@@ -77,8 +77,8 @@ TEST_F(URLRequestContextBuilderMojoTest, MojoProxyResolver) {
       test_mojo_proxy_resolver_factory_.CreateFactoryRemote());
 
 #if defined(OS_CHROMEOS)
-  builder_.SetDhcpWpadUrlClient(mojom::DhcpWpadUrlClientPtr(
-      MockMojoDhcpWpadUrlClient::CreateWithSelfOwnedReceiver(std::string())));
+  builder_.SetDhcpWpadUrlClient(
+      MockMojoDhcpWpadUrlClient::CreateWithSelfOwnedReceiver(std::string()));
 #endif  // defined(OS_CHROMEOS)
 
   std::unique_ptr<net::URLRequestContext> context(builder_.Build());
@@ -113,8 +113,8 @@ TEST_F(URLRequestContextBuilderMojoTest, ShutdownWithHungRequest) {
       test_mojo_proxy_resolver_factory_.CreateFactoryRemote());
 
 #if defined(OS_CHROMEOS)
-  builder_.SetDhcpWpadUrlClient(mojom::DhcpWpadUrlClientPtr(
-      MockMojoDhcpWpadUrlClient::CreateWithSelfOwnedReceiver(std::string())));
+  builder_.SetDhcpWpadUrlClient(
+      MockMojoDhcpWpadUrlClient::CreateWithSelfOwnedReceiver(std::string()));
 #endif  // defined(OS_CHROMEOS)
 
   std::unique_ptr<net::URLRequestContext> context(builder_.Build());