Remove VirtualSocketServer's dependency on PhysicalSocketServer.

webrtc/p2p/base/portallocator_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 <memory>
 
 #include "webrtc/base/gunit.h"
-#include "webrtc/base/physicalsocketserver.h"
 #include "webrtc/base/thread.h"
 #include "webrtc/base/virtualsocketserver.h"
 #include "webrtc/p2p/base/fakeportallocator.h"
 #include "webrtc/p2p/base/portallocator.h"
 
 static const char kContentName[] = "test content";
 // Based on ICE_UFRAG_LENGTH
 static const char kIceUfrag[] = "UF00";
 // Based on ICE_PWD_LENGTH
 static const char kIcePwd[] = "TESTICEPWD00000000000000";
 static const char kTurnUsername[] = "test";
 static const char kTurnPassword[] = "test";
 
 class PortAllocatorTest : public testing::Test, public sigslot::has_slots<> {
  public:
   PortAllocatorTest()
-      : pss_(new rtc::PhysicalSocketServer),
-        vss_(new rtc::VirtualSocketServer(pss_.get())),
-        main_(vss_.get()) {
+      : vss_(new rtc::VirtualSocketServer()), main_(vss_.get()) {
     allocator_.reset(
         new cricket::FakePortAllocator(rtc::Thread::Current(), nullptr));
   }
 
  protected:
   void SetConfigurationWithPoolSize(int candidate_pool_size) {
     EXPECT_TRUE(allocator_->SetConfiguration(
         cricket::ServerAddresses(), std::vector<cricket::RelayServerConfig>(),
         candidate_pool_size, false));
   }
@@ skipping 30 matching lines @@
 
   int GetAllPooledSessionsReturnCount() {
     int count = 0;
     while (GetPooledSession()) {
       TakePooledSession();
       ++count;
     }
     return count;
   }
 
-  std::unique_ptr<rtc::PhysicalSocketServer> pss_;
   std::unique_ptr<rtc::VirtualSocketServer> vss_;
   rtc::AutoSocketServerThread main_;
   std::unique_ptr<cricket::FakePortAllocator> allocator_;
   rtc::SocketAddress stun_server_1{"11.11.11.11", 3478};
   rtc::SocketAddress stun_server_2{"22.22.22.22", 3478};
   cricket::RelayServerConfig turn_server_1{"11.11.11.11",      3478,
                                            kTurnUsername,      kTurnPassword,
                                            cricket::PROTO_UDP, false};
   cricket::RelayServerConfig turn_server_2{"22.22.22.22",      3478,
                                            kTurnUsername,      kTurnPassword,
@@ skipping 177 matching lines @@
   EXPECT_EQ(cricket::CF_RELAY, session->candidate_filter());
 }
 
 // Verify that after DiscardCandidatePool, TakePooledSession doesn't return
 // anything.
 TEST_F(PortAllocatorTest, DiscardCandidatePool) {
   SetConfigurationWithPoolSize(1);
   allocator_->DiscardCandidatePool();
   EXPECT_EQ(0, GetAllPooledSessionsReturnCount());
 }