Remove VirtualSocketServer's dependency on PhysicalSocketServer.

webrtc/p2p/base/udptransport_unittest.cc

 /*
  *  Copyright 2016 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 <algorithm>
 #include <list>
 #include <memory>
 #include <utility>
 #include <vector>
 
 #include "webrtc/base/gunit.h"
 #include "webrtc/base/thread.h"
 #include "webrtc/base/asyncpacketsocket.h"
 #include "webrtc/base/ipaddress.h"
-#include "webrtc/base/physicalsocketserver.h"
 #include "webrtc/base/socketaddress.h"
 #include "webrtc/base/socketserver.h"
 #include "webrtc/base/virtualsocketserver.h"
 #include "webrtc/p2p/base/basicpacketsocketfactory.h"
 #include "webrtc/p2p/base/packettransportinternal.h"
 #include "webrtc/p2p/base/udptransport.h"
 
 namespace cricket {
 
 constexpr int kTimeoutMs = 10000;
 static const rtc::IPAddress kIPv4LocalHostAddress =
     rtc::IPAddress(0x7F000001);  // 127.0.0.1
 
 class UdpTransportTest : public testing::Test, public sigslot::has_slots<> {
  public:
   UdpTransportTest()
-      : physical_socket_server_(new rtc::PhysicalSocketServer),
-        virtual_socket_server_(
-            new rtc::VirtualSocketServer(physical_socket_server_.get())),
+      : virtual_socket_server_(new rtc::VirtualSocketServer()),
         network_thread_(virtual_socket_server_.get()),
         ep1_("Name1",
              std::unique_ptr<rtc::AsyncPacketSocket>(
                  socket_factory_.CreateUdpSocket(
                      rtc::SocketAddress(rtc::GetAnyIP(AF_INET), 0),
                      0,
                      0))),
         ep2_("Name2",
              std::unique_ptr<rtc::AsyncPacketSocket>(
                  socket_factory_.CreateUdpSocket(
@@ skipping 62 matching lines @@
     }
 
     std::list<std::string> ch_packets_;
     std::unique_ptr<UdpTransport> ch_;
     uint32_t num_received_packets_ = 0;   // Increases on SignalReadPacket.
     uint32_t num_sig_sent_packets_ = 0;   // Increases on SignalSentPacket.
     uint32_t num_sig_writable_ = 0;       // Increases on SignalWritable.
     uint32_t num_sig_ready_to_send_ = 0;  // Increases on SignalReadyToSend.
   };
 
-  std::unique_ptr<rtc::PhysicalSocketServer> physical_socket_server_;
   std::unique_ptr<rtc::VirtualSocketServer> virtual_socket_server_;
   rtc::AutoSocketServerThread network_thread_;
   // Uses current thread's socket server, which will be set by ss_scope_.
   rtc::BasicPacketSocketFactory socket_factory_;
 
   Endpoint ep1_;
   Endpoint ep2_;
 
   void TestSendRecv() {
     for (uint32_t i = 0; i < 5; ++i) {
@@ skipping 50 matching lines @@
   EXPECT_TRUE(ep1_.ch_->writable());
   EXPECT_EQ(1u, ep1_.num_sig_writable_);
   EXPECT_EQ(1u, ep1_.num_sig_ready_to_send_);
   const char data[] = "abc";
   ep1_.SendData(data, sizeof(data));
   EXPECT_EQ_WAIT(1u, ep1_.ch_packets_.size(), kTimeoutMs);
   EXPECT_EQ_WAIT(1u, ep1_.num_sig_sent_packets_, kTimeoutMs);
 }
 
 }  // namespace cricket