Migrate content/*/p2p/* code to net::IPAddress.

content/renderer/p2p/socket_dispatcher.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // P2PSocketDispatcher is a per-renderer object that dispatchers all
 // P2P messages received from the browser and relays all P2P messages
 // sent to the browser. P2PSocketClient instances register themselves
 // with the dispatcher using RegisterClient() and UnregisterClient().
 //
 // Relationship of classes.
@@ skipping 18 matching lines @@
 #include "base/compiler_specific.h"
 #include "base/id_map.h"
 #include "base/macros.h"
 #include "base/observer_list_threadsafe.h"
 #include "base/synchronization/lock.h"
 #include "content/common/content_export.h"
 #include "content/common/p2p_socket_type.h"
 #include "content/renderer/p2p/network_list_manager.h"
 #include "ipc/message_filter.h"
 #include "net/base/ip_address.h"
-#include "net/base/ip_address_number.h"
-#include "net/base/ip_endpoint.h"

[martijnc, 2016/03/24 20:38:16]

This was included and forward-declared.

 #include "net/base/network_interfaces.h"
 
 namespace base {
 class SingleThreadTaskRunner;
 }  // namespace base
 
 namespace net {
 class IPEndPoint;
 }  // namespace net
 
@@ skipping 39 matching lines @@
   // Called by P2PSocketClient.
   int RegisterClient(P2PSocketClientImpl* client);
   void UnregisterClient(int id);
   void SendP2PMessage(IPC::Message* msg);
 
   // Called by DnsRequest.
   int RegisterHostAddressRequest(P2PAsyncAddressResolver* request);
   void UnregisterHostAddressRequest(int id);
 
   // Incoming message handlers.
-  void OnNetworkListChanged(
-      const net::NetworkInterfaceList& networks,
-      const net::IPAddressNumber& default_ipv4_local_address,
-      const net::IPAddressNumber& default_ipv6_local_address);
+  void OnNetworkListChanged(const net::NetworkInterfaceList& networks,
+                            const net::IPAddress& default_ipv4_local_address,
+                            const net::IPAddress& default_ipv6_local_address);
   void OnGetHostAddressResult(int32_t request_id,
                               const net::IPAddressList& addresses);
   void OnSocketCreated(int socket_id,
                        const net::IPEndPoint& local_address,
                        const net::IPEndPoint& remote_address);
   void OnIncomingTcpConnection(int socket_id, const net::IPEndPoint& address);
   void OnSendComplete(int socket_id, const P2PSendPacketMetrics& send_metrics);
   void OnError(int socket_id);
   void OnDataReceived(int socket_id, const net::IPEndPoint& address,
                       const std::vector<char>& data,
@@ skipping 14 matching lines @@
 
   // To indicate whether IPC could be invoked on this dispatcher.
   bool connected_ = false;
 
   DISALLOW_COPY_AND_ASSIGN(P2PSocketDispatcher);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_P2P_SOCKET_DISPATCHER_H_