Remove VirtualSocketServer's dependency on PhysicalSocketServer.

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.
  */
 
 #include <memory>
 
 #include "webrtc/p2p/base/basicpacketsocketfactory.h"
 #include "webrtc/p2p/base/relayport.h"
 #include "webrtc/p2p/base/relayserver.h"
 #include "webrtc/base/gunit.h"
 #include "webrtc/base/helpers.h"
 #include "webrtc/base/logging.h"
-#include "webrtc/base/physicalsocketserver.h"
 #include "webrtc/base/socketadapters.h"
 #include "webrtc/base/socketaddress.h"
 #include "webrtc/base/ssladapter.h"
 #include "webrtc/base/thread.h"
 #include "webrtc/base/virtualsocketserver.h"
 
 using rtc::SocketAddress;
 
 static const SocketAddress kLocalAddress = SocketAddress("192.168.1.2", 0);
 static const SocketAddress kRelayUdpAddr = SocketAddress("99.99.99.1", 5000);
 static const SocketAddress kRelayTcpAddr = SocketAddress("99.99.99.2", 5001);
 static const SocketAddress kRelaySslAddr = SocketAddress("99.99.99.3", 443);
 static const SocketAddress kRelayExtAddr = SocketAddress("99.99.99.3", 5002);
 
 static const int kTimeoutMs = 1000;
 static const int kMaxTimeoutMs = 5000;
 
 // Tests connecting a RelayPort to a fake relay server
 // (cricket::RelayServer) using all currently available protocols. The
 // network layer is faked out by using a VirtualSocketServer for
 // 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()
-      : physical_socket_server_(new rtc::PhysicalSocketServer),
-        virtual_socket_server_(new rtc::VirtualSocketServer(
-            physical_socket_server_.get())),
+      : virtual_socket_server_(new rtc::VirtualSocketServer()),
         main_(virtual_socket_server_.get()),
         network_("unittest", "unittest", rtc::IPAddress(INADDR_ANY), 32),
         socket_factory_(rtc::Thread::Current()),
         username_(rtc::CreateRandomString(16)),
         password_(rtc::CreateRandomString(16)),
-        relay_port_(cricket::RelayPort::Create(&main_, &socket_factory_,
+        relay_port_(cricket::RelayPort::Create(&main_,
+                                               &socket_factory_,
                                                &network_,
                                                kLocalAddress.ipaddr(),
-                                               0, 0, username_, password_)),
-        relay_server_(new cricket::RelayServer(&main_)) {
-  }
+                                               0,
+                                               0,
+                                               username_,
+                                               password_)),
+        relay_server_(new cricket::RelayServer(&main_)) {}
 
   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 167 matching lines @@
       if (soft_timedout_connections_[i].address == addr->address &&
           soft_timedout_connections_[i].proto == addr->proto) {
         return true;
       }
     }
     return false;
   }
 
   typedef std::map<rtc::AsyncPacketSocket*, int> PacketMap;
 
-  std::unique_ptr<rtc::PhysicalSocketServer> physical_socket_server_;
   std::unique_ptr<rtc::VirtualSocketServer> virtual_socket_server_;
   rtc::AutoSocketServerThread main_;
   rtc::Network network_;
   rtc::BasicPacketSocketFactory socket_factory_;
   std::string username_;
   std::string password_;
   std::unique_ptr<cricket::RelayPort> relay_port_;
   std::unique_ptr<cricket::RelayServer> relay_server_;
   std::vector<cricket::ProtocolAddress> failed_connections_;
   std::vector<cricket::ProtocolAddress> soft_timedout_connections_;
   PacketMap received_packet_count_;
 };
 
 TEST_F(RelayPortTest, ConnectUdp) {
   TestConnectUdp();
 }
 
 TEST_F(RelayPortTest, ConnectTcp) {
   TestConnectTcp();
 }
 
 TEST_F(RelayPortTest, ConnectSslTcp) {
   TestConnectSslTcp();
 }