De-Clientize UDPSocket service

mojo/services/network/udp_socket_apptest.cc

Index: mojo/services/network/udp_socket_apptest.cc
diff --git a/mojo/services/network/udp_socket_apptest.cc b/mojo/services/network/udp_socket_apptest.cc
index 86f3387a6232f30fda270f1b17020a5d36a42773..52b98e37e92da4ed658181c025b1792d9071d59b 100644
--- a/mojo/services/network/udp_socket_apptest.cc
+++ b/mojo/services/network/udp_socket_apptest.cc
@@ -228,11 +228,11 @@ struct ReceiveResult {
   Array<uint8_t> data;
 };
 
-class UDPSocketClientImpl : public UDPSocketClient {
+class UDPSocketReceiverImpl : public UDPSocketReceiver {
  public:
-  UDPSocketClientImpl() : run_loop_(nullptr), expected_receive_count_(0) {}
+  UDPSocketReceiverImpl() : run_loop_(nullptr), expected_receive_count_(0) {}
 
-  ~UDPSocketClientImpl() override {
+  ~UDPSocketReceiverImpl() override {
     while (!results_.empty()) {
       delete results_.front();
       results_.pop();
@@ -275,12 +275,12 @@ class UDPSocketClientImpl : public UDPSocketClient {
   std::queue<ReceiveResult*> results_;
   size_t expected_receive_count_;
 
-  DISALLOW_COPY_AND_ASSIGN(UDPSocketClientImpl);
+  DISALLOW_COPY_AND_ASSIGN(UDPSocketReceiverImpl);
 };
 
 class UDPSocketAppTest : public test::ApplicationTestBase {
  public:
-  UDPSocketAppTest() {}
+  UDPSocketAppTest() : receiver_binding_(&receiver_) {}
   ~UDPSocketAppTest() override {}
 
   void SetUp() override {
@@ -291,13 +291,17 @@ class UDPSocketAppTest : public test::ApplicationTestBase {
     connection->ConnectToService(&network_service_);
 
     network_service_->CreateUDPSocket(GetProxy(&socket_));
-    socket_.set_client(&receiver_);
+
+    UDPSocketReceiverPtr receiver_proxy;
+    receiver_binding_.Bind(&receiver_proxy);
+    socket_->SetReceiver(receiver_proxy.Pass());
   }
 
  protected:
   NetworkServicePtr network_service_;
   UDPSocketPtr socket_;
-  UDPSocketClientImpl receiver_;
+  UDPSocketReceiverImpl receiver_;
+  Binding<UDPSocketReceiver> receiver_binding_;
 
   DISALLOW_COPY_AND_ASSIGN(UDPSocketAppTest);
 };
@@ -412,8 +416,12 @@ TEST_F(UDPSocketAppTest, TestConnectedReadWrite) {
 
   UDPSocketPtr client_socket;
   network_service_->CreateUDPSocket(GetProxy(&client_socket));
-  UDPSocketClientImpl client_socket_receiver;
-  client_socket.set_client(&client_socket_receiver);
+
+  UDPSocketReceiverImpl client_socket_receiver;
+  UDPSocketReceiverPtr receiver_proxy;
+  Binding<UDPSocketReceiver> receiver_binding(&client_socket_receiver,
+                                              &receiver_proxy);
+  client_socket->SetReceiver(receiver_proxy.Pass());
 
   TestCallbackWithAddress callback2;
   client_socket->Connect(server_addr.Clone(), callback2.callback());