mojo: network-service: Rename UDPSocketReceiver to UDPSocketListener

`Receiver` is used in Mojo for the receiver endpoint of an interface.
Having an interface called Receiver with a different meaning is
confusing and causes conflicts when generating Receiver classes in
javascript.

TBR=amistry@chromium.org,thestig@chromium.org,raymes@chromium.org,miu@chromium.org,sky@chromium.org

Bug: 968369
Change-Id: Ie50165d1464ed1b72c8d2ac3e541b96048223856
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1746106
Commit-Queue: Giovanni Ortuño Urquidi <ortuno@chromium.org>
Reviewed-by: Reilly Grant <reillyg@chromium.org>
Cr-Commit-Position: refs/heads/master@{#685858}

chrome/browser/chromeos/smb_client/discovery/netbios_client.cc

@@ -49,11 +49,11 @@ constexpr net::NetworkTrafficAnnotationTag GetNetworkTrafficAnnotationTag() {
 
 NetBiosClient::NetBiosClient(network::mojom::NetworkContext* network_context)
     : bind_address_(net::IPAddress::IPv4AllZeros(), 0 /* port */),
-      receiver_binding_(this) {
+      listener_binding_(this) {
   DCHECK(network_context);
 
-  network::mojom::UDPSocketReceiverPtr rec_int_ptr;
-  receiver_binding_.Bind(mojo::MakeRequest(&rec_int_ptr));
+  network::mojom::UDPSocketListenerPtr rec_int_ptr;
+  listener_binding_.Bind(mojo::MakeRequest(&rec_int_ptr));
 
   network_context->CreateUDPSocket(mojo::MakeRequest(&server_socket_),
                                    std::move(rec_int_ptr));

chrome/browser/chromeos/smb_client/discovery/netbios_client.h

@@ -48,7 +48,7 @@ namespace smb_client {
 // The socket remains open and receives response as long as the instance of this
 // class is alive. Upon destruction, the socket and corresponding firewall hole
 // are closed.
-class NetBiosClient : public network::mojom::UDPSocketReceiver,
+class NetBiosClient : public network::mojom::UDPSocketListener,
                       public NetBiosClientInterface,
                       public base::SupportsWeakPtr<NetBiosClient> {
  public:
@@ -90,7 +90,7 @@ class NetBiosClient : public network::mojom::UDPSocketReceiver,
   // Callback handler for SendPacket.
   void OnSendCompleted(int32_t result);
 
-  // network::mojom::UDPSocketReceiver implementation.
+  // network::mojom::UDPSocketListener implementation.
   void OnReceived(int32_t result,
                   const base::Optional<net::IPEndPoint>& src_ip,
                   base::Optional<base::span<const uint8_t>> data) override;
@@ -107,7 +107,7 @@ class NetBiosClient : public network::mojom::UDPSocketReceiver,
   NetBiosResponseCallback callback_;
   std::unique_ptr<FirewallHole> firewall_hole_;
   network::mojom::UDPSocketPtr server_socket_;
-  mojo::Binding<network::mojom::UDPSocketReceiver> receiver_binding_;
+  mojo::Binding<network::mojom::UDPSocketListener> listener_binding_;
 
   DISALLOW_COPY_AND_ASSIGN(NetBiosClient);
 };

chrome/browser/extensions/api/socket/udp_socket_unittest.cc

@@ -38,13 +38,13 @@ class UDPSocketUnitTest : public extensions::ExtensionServiceTestBase {
         content::BrowserContext::GetDefaultStoragePartition(profile())
             ->GetNetworkContext();
     network::mojom::UDPSocketPtrInfo socket;
-    network::mojom::UDPSocketReceiverPtr receiver_ptr;
-    network::mojom::UDPSocketReceiverRequest receiver_request =
-        mojo::MakeRequest(&receiver_ptr);
+    network::mojom::UDPSocketListenerPtr listener_ptr;
+    network::mojom::UDPSocketListenerRequest listener_request =
+        mojo::MakeRequest(&listener_ptr);
     network_context->CreateUDPSocket(mojo::MakeRequest(&socket),
-                                     std::move(receiver_ptr));
+                                     std::move(listener_ptr));
     return std::make_unique<UDPSocket>(
-        std::move(socket), std::move(receiver_request), "abcdefghijklmnopqrst");
+        std::move(socket), std::move(listener_request), "abcdefghijklmnopqrst");
   }
 };
 
@@ -174,7 +174,7 @@ TEST_F(UDPSocketUnitTest, TestUDPMulticastRecv) {
   std::unique_ptr<UDPSocket> src = CreateSocket();
   std::unique_ptr<UDPSocket> dest = CreateSocket();
 
-  // Receiver
+  // Listener
   {
     net::TestCompletionCallback callback;
     dest->Bind("0.0.0.0", kPort, callback.callback());

chrome/browser/printing/cloud_print/privet_traffic_detector.cc

@@ -64,12 +64,12 @@ void GetNetworkListOnUIThread(
 void CreateUDPSocketOnUIThread(
     content::BrowserContext* profile,
     network::mojom::UDPSocketRequest request,
-    network::mojom::UDPSocketReceiverPtr receiver_ptr) {
+    network::mojom::UDPSocketListenerPtr listener_ptr) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   network::mojom::NetworkContext* network_context =
       content::BrowserContext::GetDefaultStoragePartition(profile)
           ->GetNetworkContext();
-  network_context->CreateUDPSocket(std::move(request), std::move(receiver_ptr));
+  network_context->CreateUDPSocket(std::move(request), std::move(listener_ptr));
 }
 
 }  // namespace
@@ -109,7 +109,7 @@ PrivetTrafficDetector::Helper::Helper(
     : profile_(profile),
       on_traffic_detected_(on_traffic_detected),
       restart_attempts_(kMaxRestartAttempts),
-      receiver_binding_(this) {
+      listener_binding_(this) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 }
 
@@ -148,14 +148,14 @@ void PrivetTrafficDetector::Helper::Restart(
 void PrivetTrafficDetector::Helper::Bind() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
 
-  network::mojom::UDPSocketReceiverPtr receiver_ptr;
-  network::mojom::UDPSocketReceiverRequest receiver_request =
-      mojo::MakeRequest(&receiver_ptr);
-  receiver_binding_.Bind(std::move(receiver_request));
+  network::mojom::UDPSocketListenerPtr listener_ptr;
+  network::mojom::UDPSocketListenerRequest listener_request =
+      mojo::MakeRequest(&listener_ptr);
+  listener_binding_.Bind(std::move(listener_request));
   base::PostTask(
       FROM_HERE, {content::BrowserThread::UI},
       base::BindOnce(&CreateUDPSocketOnUIThread, profile_,
-                     mojo::MakeRequest(&socket_), std::move(receiver_ptr)));
+                     mojo::MakeRequest(&socket_), std::move(listener_ptr)));
 
   network::mojom::UDPSocketOptionsPtr socket_options =
       network::mojom::UDPSocketOptions::New();
@@ -238,7 +238,7 @@ void PrivetTrafficDetector::Helper::OnJoinGroupComplete(int rv) {
 void PrivetTrafficDetector::Helper::ResetConnection() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
   socket_.reset();
-  receiver_binding_.Close();
+  listener_binding_.Close();
 }
 
 void PrivetTrafficDetector::Helper::OnReceived(

chrome/browser/printing/cloud_print/privet_traffic_detector.h

@@ -43,13 +43,13 @@ class PrivetTrafficDetector
  private:
   // Constructed by PrivetTrafficDetector on the UI thread. but lives on the IO
   // thread and destroyed on the IO thread.
-  class Helper : public network::mojom::UDPSocketReceiver {
+  class Helper : public network::mojom::UDPSocketListener {
    public:
     Helper(content::BrowserContext* profile,
            base::RepeatingClosure on_traffic_detected);
     ~Helper() override;
 
-    // network::mojom::UDPSocketReceiver:
+    // network::mojom::UDPSocketListener:
     void OnReceived(int32_t result,
                     const base::Optional<net::IPEndPoint>& src_addr,
                     base::Optional<base::span<const uint8_t>> data) override;
@@ -81,9 +81,9 @@ class PrivetTrafficDetector
     net::IPEndPoint recv_addr_;
     network::mojom::UDPSocketPtr socket_;
 
-    // Implementation of socket receiver callback.
+    // Implementation of socket listener callback.
     // Initialized on the UI thread, but only accessed on the IO thread.
-    mojo::Binding<network::mojom::UDPSocketReceiver> receiver_binding_;
+    mojo::Binding<network::mojom::UDPSocketListener> listener_binding_;
 
     base::WeakPtrFactory<Helper> weak_ptr_factory_{this};
 

chrome/test/ppapi/ppapi_browsertest.cc

@@ -1043,18 +1043,18 @@ class WrappedUDPSocket : public network::mojom::UDPSocket {
     kBroadcastDropPipe,
     kSendToDropPipe,
     kSendToError,
-    kDropReceiverPipeOnConstruction,
-    kDropReceiverPipeOnReceiveMore,
+    kDropListenerPipeOnConstruction,
+    kDropListenerPipeOnReceiveMore,
     kReadError,
   };
   WrappedUDPSocket(FailureType failure_type,
                    network::mojom::NetworkContext* network_context,
                    network::mojom::UDPSocketRequest socket_request,
-                   network::mojom::UDPSocketReceiverPtr socket_receiver)
+                   network::mojom::UDPSocketListenerPtr socket_listener)
       : failure_type_(failure_type), binding_(this, std::move(socket_request)) {
-    if (failure_type == FailureType::kDropReceiverPipeOnConstruction)
-      socket_receiver.reset();
-    socket_receiver_ = std::move(socket_receiver);
+    if (failure_type == FailureType::kDropListenerPipeOnConstruction)
+      socket_listener.reset();
+    socket_listener_ = std::move(socket_listener);
     network_context->CreateUDPSocket(mojo::MakeRequest(&wrapped_socket_),
                                      nullptr);
     binding_.set_connection_error_handler(
@@ -1111,13 +1111,13 @@ class WrappedUDPSocket : public network::mojom::UDPSocket {
     wrapped_socket_->LeaveGroup(group_address, std::move(callback));
   }
   void ReceiveMore(uint32_t num_additional_datagrams) override {
-    if (failure_type_ == FailureType::kDropReceiverPipeOnReceiveMore) {
-      socket_receiver_.reset();
+    if (failure_type_ == FailureType::kDropListenerPipeOnReceiveMore) {
+      socket_listener_.reset();
       return;
     }
     if (failure_type_ == FailureType::kReadError) {
       for (uint32_t i = 0; i < num_additional_datagrams; ++i) {
-        socket_receiver_->OnReceived(net::ERR_FAILED, base::nullopt,
+        socket_listener_->OnReceived(net::ERR_FAILED, base::nullopt,
                                      base::nullopt);
       }
       return;
@@ -1154,7 +1154,7 @@ class WrappedUDPSocket : public network::mojom::UDPSocket {
     // Deleting |this| before closing the bindings can cause Mojo to DCHECK if
     // there's a pending callback.
     binding_.Close();
-    socket_receiver_.reset();
+    socket_listener_.reset();
     delete this;
   }
 
@@ -1164,7 +1164,7 @@ class WrappedUDPSocket : public network::mojom::UDPSocket {
   network::mojom::UDPSocketPtr wrapped_socket_;
 
   // Only populated on certain read FailureTypes.
-  network::mojom::UDPSocketReceiverPtr socket_receiver_;
+  network::mojom::UDPSocketListenerPtr socket_listener_;
 
   DISALLOW_COPY_AND_ASSIGN(WrappedUDPSocket);
 };
@@ -1173,10 +1173,10 @@ void TestCreateUDPSocketCallback(
     WrappedUDPSocket::FailureType failure_type,
     network::mojom::NetworkContext* network_context,
     network::mojom::UDPSocketRequest socket_request,
-    network::mojom::UDPSocketReceiverPtr socket_receiver) {
+    network::mojom::UDPSocketListenerPtr socket_listener) {
   // This will delete itself when one of its Mojo pipes is closed.
   new WrappedUDPSocket(failure_type, network_context, std::move(socket_request),
-                       std::move(socket_receiver));
+                       std::move(socket_listener));
 }
 
 #define RUN_UDP_FAILURE_TEST(test_name, failure_type)                    \
@@ -1233,13 +1233,13 @@ UDPSOCKET_FAILURE_TEST(UDPSocket_ReadError,
                        UDPSocket_ReadFails,
                        WrappedUDPSocket::FailureType::kReadError)
 UDPSOCKET_FAILURE_TEST(
-    UDPSocket_DropReceiverPipeOnConstruction,
+    UDPSocket_DropListenerPipeOnConstruction,
     UDPSocket_ReadFails,
-    WrappedUDPSocket::FailureType::kDropReceiverPipeOnConstruction)
+    WrappedUDPSocket::FailureType::kDropListenerPipeOnConstruction)
 UDPSOCKET_FAILURE_TEST(
-    UDPSocket_DropReceiverPipeOnReceiveMore,
+    UDPSocket_DropListenerPipeOnReceiveMore,
     UDPSocket_ReadFails,
-    WrappedUDPSocket::FailureType::kDropReceiverPipeOnReceiveMore)
+    WrappedUDPSocket::FailureType::kDropListenerPipeOnReceiveMore)
 
 // Disallowed socket tests.
 TEST_PPAPI_NACL_DISALLOWED_SOCKETS(HostResolverPrivateDisallowed)

components/mirroring/service/fake_network_service.cc

@@ -11,8 +11,8 @@
 namespace mirroring {
 
 MockUdpSocket::MockUdpSocket(network::mojom::UDPSocketRequest request,
-                             network::mojom::UDPSocketReceiverPtr receiver)
-    : binding_(this, std::move(request)), receiver_(std::move(receiver)) {}
+                             network::mojom::UDPSocketListenerPtr listener)
+    : binding_(this, std::move(request)), listener_(std::move(listener)) {}
 
 MockUdpSocket::~MockUdpSocket() {}
 
@@ -38,7 +38,7 @@ void MockUdpSocket::Send(
 
 void MockUdpSocket::OnReceivedPacket(const media::cast::Packet& packet) {
   if (num_ask_for_receive_) {
-    receiver_->OnReceived(
+    listener_->OnReceived(
         net::OK, base::nullopt,
         base::span<const uint8_t>(
             reinterpret_cast<const uint8_t*>(packet.data()), packet.size()));
@@ -59,9 +59,9 @@ MockNetworkContext::~MockNetworkContext() {}
 
 void MockNetworkContext::CreateUDPSocket(
     network::mojom::UDPSocketRequest request,
-    network::mojom::UDPSocketReceiverPtr receiver) {
+    network::mojom::UDPSocketListenerPtr listener) {
   udp_socket_ =
-      std::make_unique<MockUdpSocket>(std::move(request), std::move(receiver));
+      std::make_unique<MockUdpSocket>(std::move(request), std::move(listener));
   OnUDPSocketCreated();
 }
 

components/mirroring/service/fake_network_service.h

@@ -18,7 +18,7 @@ namespace mirroring {
 class MockUdpSocket final : public network::mojom::UDPSocket {
  public:
   MockUdpSocket(network::mojom::UDPSocketRequest request,
-                network::mojom::UDPSocketReceiverPtr receiver);
+                network::mojom::UDPSocketListenerPtr listener);
   ~MockUdpSocket() override;
 
   MOCK_METHOD0(OnSend, void());
@@ -58,7 +58,7 @@ class MockUdpSocket final : public network::mojom::UDPSocket {
 
  private:
   mojo::Binding<network::mojom::UDPSocket> binding_;
-  network::mojom::UDPSocketReceiverPtr receiver_;
+  network::mojom::UDPSocketListenerPtr listener_;
   std::unique_ptr<media::cast::Packet> sending_packet_;
   int num_ask_for_receive_ = 0;
 
@@ -74,7 +74,7 @@ class MockNetworkContext final : public network::TestNetworkContext {
 
   // network::mojom::NetworkContext implementation:
   void CreateUDPSocket(network::mojom::UDPSocketRequest request,
-                       network::mojom::UDPSocketReceiverPtr receiver) override;
+                       network::mojom::UDPSocketListenerPtr listener) override;
   void CreateURLLoaderFactory(
       network::mojom::URLLoaderFactoryRequest request,
       network::mojom::URLLoaderFactoryParamsPtr params) override;

components/mirroring/service/udp_socket_client.cc

@@ -105,10 +105,10 @@ void UdpSocketClient::StartReceiving(
     const media::cast::PacketReceiverCallbackWithStatus& packet_receiver) {
   DVLOG(1) << __func__;
   packet_receiver_callback_ = packet_receiver;
-  network::mojom::UDPSocketReceiverPtr udp_socket_receiver;
-  binding_.Bind(mojo::MakeRequest(&udp_socket_receiver));
+  network::mojom::UDPSocketListenerPtr udp_socket_listener;
+  binding_.Bind(mojo::MakeRequest(&udp_socket_listener));
   network_context_->CreateUDPSocket(mojo::MakeRequest(&udp_socket_),
-                                    std::move(udp_socket_receiver));
+                                    std::move(udp_socket_listener));
   network::mojom::UDPSocketOptionsPtr options;
   udp_socket_->Connect(remote_endpoint_, std::move(options),
                        base::BindOnce(&UdpSocketClient::OnSocketConnected,

components/mirroring/service/udp_socket_client.h

@@ -23,7 +23,7 @@ namespace mirroring {
 // will be called if the UDPSocket is failed to be created or connected.
 class COMPONENT_EXPORT(MIRRORING_SERVICE) UdpSocketClient final
     : public media::cast::PacketTransport,
-      public network::mojom::UDPSocketReceiver {
+      public network::mojom::UDPSocketListener {
  public:
   UdpSocketClient(const net::IPEndPoint& remote_endpoint,
                   network::mojom::NetworkContext* context,
@@ -39,7 +39,7 @@ class COMPONENT_EXPORT(MIRRORING_SERVICE) UdpSocketClient final
                           packet_receiver) override;
   void StopReceiving() override;
 
-  // network::mojom::UDPSocketReceiver implementation.
+  // network::mojom::UDPSocketListener implementation.
   void OnReceived(int32_t result,
                   const base::Optional<net::IPEndPoint>& src_addr,
                   base::Optional<base::span<const uint8_t>> data) override;
@@ -59,7 +59,7 @@ class COMPONENT_EXPORT(MIRRORING_SERVICE) UdpSocketClient final
   network::mojom::NetworkContext* const network_context_;
   base::OnceClosure error_callback_;
 
-  mojo::Binding<network::mojom::UDPSocketReceiver> binding_;
+  mojo::Binding<network::mojom::UDPSocketListener> binding_;
 
   // The callback to deliver the received packets to the packet parser. Set
   // when StartReceiving() is called.