Remove VirtualSocketServer's dependency on PhysicalSocketServer.

webrtc/base/nat_unittest.cc

 /*
  *  Copyright 2004 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 250 matching lines @@
     TestPhysicalInternal(SocketAddress("::1", 0));
   } else {
     LOG(LS_WARNING) << "No IPv6, skipping";
   }
 }
 
 namespace {
 
 class TestVirtualSocketServer : public VirtualSocketServer {
  public:
-  explicit TestVirtualSocketServer(SocketServer* ss)
-      : VirtualSocketServer(ss),
-        ss_(ss) {}
   // Expose this publicly
   IPAddress GetNextIP(int af) { return VirtualSocketServer::GetNextIP(af); }
-
- private:
-  std::unique_ptr<SocketServer> ss_;
 };
 
 }  // namespace
 
 void TestVirtualInternal(int family) {
   std::unique_ptr<TestVirtualSocketServer> int_vss(
-      new TestVirtualSocketServer(new PhysicalSocketServer()));
+      new TestVirtualSocketServer());
   std::unique_ptr<TestVirtualSocketServer> ext_vss(
-      new TestVirtualSocketServer(new PhysicalSocketServer()));
+      new TestVirtualSocketServer());
 
   SocketAddress int_addr;
   SocketAddress ext_addrs[4];
   int_addr.SetIP(int_vss->GetNextIP(family));
   ext_addrs[0].SetIP(ext_vss->GetNextIP(int_addr.family()));
   ext_addrs[1].SetIP(ext_vss->GetNextIP(int_addr.family()));
   ext_addrs[2].SetIP(ext_addrs[0].ipaddr());
   ext_addrs[3].SetIP(ext_addrs[1].ipaddr());
 
   TestBindings(int_vss.get(), int_addr, ext_vss.get(), ext_addrs);
@@ skipping 11 matching lines @@
     LOG(LS_WARNING) << "No IPv6, skipping";
   }
 }
 
 class NatTcpTest : public testing::Test, public sigslot::has_slots<> {
  public:
   NatTcpTest()
       : int_addr_("192.168.0.1", 0),
         ext_addr_("10.0.0.1", 0),
         connected_(false),
-        int_pss_(new PhysicalSocketServer()),
-        ext_pss_(new PhysicalSocketServer()),
-        int_vss_(new TestVirtualSocketServer(int_pss_)),
-        ext_vss_(new TestVirtualSocketServer(ext_pss_)),
+        int_vss_(new TestVirtualSocketServer()),
+        ext_vss_(new TestVirtualSocketServer()),
         int_thread_(new Thread(int_vss_.get())),
         ext_thread_(new Thread(ext_vss_.get())),
-        nat_(new NATServer(NAT_OPEN_CONE, int_vss_.get(), int_addr_, int_addr_,
-                           ext_vss_.get(), ext_addr_)),
+        nat_(new NATServer(NAT_OPEN_CONE,
+                           int_vss_.get(),
+                           int_addr_,
+                           int_addr_,
+                           ext_vss_.get(),
+                           ext_addr_)),
         natsf_(new NATSocketFactory(int_vss_.get(),
                                     nat_->internal_udp_address(),
                                     nat_->internal_tcp_address())) {
     int_thread_->Start();
     ext_thread_->Start();
   }
 
   void OnConnectEvent(AsyncSocket* socket) {
     connected_ = true;
   }
 
   void OnAcceptEvent(AsyncSocket* socket) {
     accepted_.reset(server_->Accept(nullptr));
   }
 
   void OnCloseEvent(AsyncSocket* socket, int error) {
   }
 
   void ConnectEvents() {
     server_->SignalReadEvent.connect(this, &NatTcpTest::OnAcceptEvent);
     client_->SignalConnectEvent.connect(this, &NatTcpTest::OnConnectEvent);
   }
 
   SocketAddress int_addr_;
   SocketAddress ext_addr_;
   bool connected_;
-  PhysicalSocketServer* int_pss_;
-  PhysicalSocketServer* ext_pss_;
   std::unique_ptr<TestVirtualSocketServer> int_vss_;
   std::unique_ptr<TestVirtualSocketServer> ext_vss_;
   std::unique_ptr<Thread> int_thread_;
   std::unique_ptr<Thread> ext_thread_;
   std::unique_ptr<NATServer> nat_;
   std::unique_ptr<NATSocketFactory> natsf_;
   std::unique_ptr<AsyncSocket> client_;
   std::unique_ptr<AsyncSocket> server_;
   std::unique_ptr<AsyncSocket> accepted_;
 };
@@ skipping 21 matching lines @@
   size_t len = strlen(buf);
 
   in->Send(buf, len);
   SocketAddress trans_addr;
   EXPECT_TRUE(out->CheckNextPacket(buf, len, &trans_addr));
 
   out->Send(buf, len);
   EXPECT_TRUE(in->CheckNextPacket(buf, len, &trans_addr));
 }
 // #endif