Make Port (and subclasses) fully "Network"-based, instead of IP-based.

webrtc/p2p/base/relayport_unittest.cc

 /*
  *  Copyright 2009 The WebRTC Project Authors. All rights reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 28 matching lines @@
 // creating sockets. The test will monitor the current state of the
 // RelayPort and created sockets by listening for signals such as,
 // SignalConnectFailure, SignalConnectTimeout, SignalSocketClosed and
 // SignalReadPacket.
 class RelayPortTest : public testing::Test,
                       public sigslot::has_slots<> {
  public:
   RelayPortTest()
       : virtual_socket_server_(new rtc::VirtualSocketServer()),
         main_(virtual_socket_server_.get()),
-        network_("unittest", "unittest", rtc::IPAddress(INADDR_ANY), 32),
+        network_("unittest", "unittest", kLocalAddress.ipaddr(), 32),
         socket_factory_(rtc::Thread::Current()),
         username_(rtc::CreateRandomString(16)),
         password_(rtc::CreateRandomString(16)),
         relay_port_(cricket::RelayPort::Create(&main_,
                                                &socket_factory_,
                                                &network_,
-                                               kLocalAddress.ipaddr(),
                                                0,
                                                0,
                                                username_,
                                                password_)),
-        relay_server_(new cricket::RelayServer(&main_)) {}
+        relay_server_(new cricket::RelayServer(&main_)) {
+    network_.AddIP(kLocalAddress.ipaddr());
+  }
 
   void OnReadPacket(rtc::AsyncPacketSocket* socket,
                     const char* data, size_t size,
                     const rtc::SocketAddress& remote_addr,
                     const rtc::PacketTime& packet_time) {
     received_packet_count_[socket]++;
   }
 
   void OnConnectFailure(const cricket::ProtocolAddress* addr) {
     failed_connections_.push_back(*addr);
@@ skipping 191 matching lines @@
   TestConnectUdp();
 }
 
 TEST_F(RelayPortTest, ConnectTcp) {
   TestConnectTcp();
 }
 
 TEST_F(RelayPortTest, ConnectSslTcp) {
   TestConnectSslTcp();
 }