Convert network_service_test.mojom to new Mojo types

This CL converts NetworkServiceTest from
network_service_test.mojom to new Mojo types using Remote.
It updates NetworkServiceTestHelper with new Mojo types.

Bug: 955171
Change-Id: Ifa4b40a69740ab90aef7a2abe03bafd72e605c15
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1847691Reviewed-by: Ken Rockot <rockot@google.com>
Reviewed-by: Kinuko Yasuda <kinuko@chromium.org>
Commit-Queue: Julie Kim <jkim@igalia.com>
Cr-Commit-Position: refs/heads/master@{#705837}

content/public/test/network_service_test_helper.cc

@@ -19,7 +19,7 @@
 #include "content/public/common/content_features.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/test/test_host_resolver.h"
-#include "mojo/public/cpp/bindings/binding_set.h"
+#include "mojo/public/cpp/bindings/receiver_set.h"
 #include "net/cert/mock_cert_verifier.h"
 #include "net/cert/test_root_certs.h"
 #include "net/dns/mock_host_resolver.h"
@@ -230,8 +230,9 @@ class NetworkServiceTestHelper::NetworkServiceTestImpl
     std::move(callback).Run();
   }
 
-  void BindRequest(network::mojom::NetworkServiceTestRequest request) {
-    bindings_.AddBinding(this, std::move(request));
+  void BindReceiver(
+      mojo::PendingReceiver<network::mojom::NetworkServiceTest> receiver) {
+    receivers_.Add(this, std::move(receiver));
     if (!registered_as_destruction_observer_) {
       base::MessageLoopCurrentForIO::Get()->AddDestructionObserver(this);
       registered_as_destruction_observer_ = true;
@@ -241,7 +242,7 @@ class NetworkServiceTestHelper::NetworkServiceTestImpl
   // base::MessageLoopCurrent::DestructionObserver:
   void WillDestroyCurrentMessageLoop() override {
     // Needs to be called on the IO thread.
-    bindings_.CloseAllBindings();
+    receivers_.Clear();
   }
 
  private:
@@ -251,7 +252,7 @@ class NetworkServiceTestHelper::NetworkServiceTestImpl
   }
 
   bool registered_as_destruction_observer_ = false;
-  mojo::BindingSet<network::mojom::NetworkServiceTest> bindings_;
+  mojo::ReceiverSet<network::mojom::NetworkServiceTest> receivers_;
   TestHostResolver test_host_resolver_;
   std::unique_ptr<net::MockCertVerifier> mock_cert_verifier_;
   std::unique_ptr<net::ScopedTransportSecurityStateSource>
@@ -272,7 +273,7 @@ NetworkServiceTestHelper::~NetworkServiceTestHelper() = default;
 void NetworkServiceTestHelper::RegisterNetworkBinders(
     service_manager::BinderRegistry* registry) {
   registry->AddInterface(
-      base::Bind(&NetworkServiceTestHelper::BindNetworkServiceTestRequest,
+      base::Bind(&NetworkServiceTestHelper::BindNetworkServiceTestReceiver,
                  base::Unretained(this)));
 
   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
@@ -298,9 +299,9 @@ void NetworkServiceTestHelper::RegisterNetworkBinders(
   }
 }
 
-void NetworkServiceTestHelper::BindNetworkServiceTestRequest(
-    network::mojom::NetworkServiceTestRequest request) {
-  network_service_test_impl_->BindRequest(std::move(request));
+void NetworkServiceTestHelper::BindNetworkServiceTestReceiver(
+    mojo::PendingReceiver<network::mojom::NetworkServiceTest> receiver) {
+  network_service_test_impl_->BindReceiver(std::move(receiver));
 }
 
 }  // namespace content

content/public/test/network_service_test_helper.h

@@ -8,6 +8,7 @@
 #include <memory>
 
 #include "base/macros.h"
+#include "mojo/public/cpp/bindings/pending_receiver.h"
 #include "services/network/public/mojom/network_service_test.mojom.h"
 #include "services/service_manager/public/cpp/binder_registry.h"
 
@@ -29,8 +30,8 @@ class NetworkServiceTestHelper {
  private:
   class NetworkServiceTestImpl;
 
-  void BindNetworkServiceTestRequest(
-      network::mojom::NetworkServiceTestRequest request);
+  void BindNetworkServiceTestReceiver(
+      mojo::PendingReceiver<network::mojom::NetworkServiceTest> receiver);
 
   std::unique_ptr<NetworkServiceTestImpl> network_service_test_impl_;