Remove VirtualSocketServer's dependency on PhysicalSocketServer.

webrtc/ortc/ortcfactory_integrationtest.cc

 /*
  *  Copyright 2017 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 <utility>  // For std::pair, std::move.
 
 #include "webrtc/api/ortc/ortcfactoryinterface.h"
 #include "webrtc/base/criticalsection.h"
 #include "webrtc/base/fakenetwork.h"
 #include "webrtc/base/gunit.h"
-#include "webrtc/base/physicalsocketserver.h"
 #include "webrtc/base/virtualsocketserver.h"
 #include "webrtc/ortc/testrtpparameters.h"
 #include "webrtc/p2p/base/udptransport.h"
 #include "webrtc/pc/test/fakeaudiocapturemodule.h"
 #include "webrtc/pc/test/fakeperiodicvideocapturer.h"
 #include "webrtc/pc/test/fakevideotrackrenderer.h"
 
 namespace {
 
 const int kDefaultTimeout = 10000;    // 10 seconds.
@@ skipping 34 matching lines @@
 
 // Used to test that things work end-to-end when using the default
 // implementations of threads/etc. provided by OrtcFactory, with the exception
 // of using a virtual network.
 //
 // By default, the virtual network manager doesn't enumerate any networks, but
 // sockets can still be created in this state.
 class OrtcFactoryIntegrationTest : public testing::Test {
  public:
   OrtcFactoryIntegrationTest()
-      : virtual_socket_server_(&physical_socket_server_),
-        network_thread_(&virtual_socket_server_),
+      : network_thread_(&virtual_socket_server_),
         fake_audio_capture_module1_(FakeAudioCaptureModule::Create()),
         fake_audio_capture_module2_(FakeAudioCaptureModule::Create()) {
     // Sockets are bound to the ANY address, so this is needed to tell the
     // virtual network which address to use in this case.
     virtual_socket_server_.SetDefaultRoute(kIPv4LocalHostAddress);
     network_thread_.Start();
     // Need to create after network thread is started.
     ortc_factory1_ = OrtcFactoryInterface::Create(
                          &network_thread_, nullptr, &fake_network_manager_,
                          nullptr, fake_audio_capture_module1_)
@@ skipping 238 matching lines @@
           kDefaultTimeout);
     } else {
       WAIT(false, kReceivingDuration);
       rendered_video_frames1_ = fake_video_renderer1.num_rendered_frames();
       rendered_video_frames2_ = fake_video_renderer2.num_rendered_frames();
       received_audio_frames1_ = fake_audio_capture_module1_->frames_received();
       received_audio_frames2_ = fake_audio_capture_module2_->frames_received();
     }
   }
 
-  rtc::PhysicalSocketServer physical_socket_server_;
   rtc::VirtualSocketServer virtual_socket_server_;
   rtc::Thread network_thread_;
   rtc::FakeNetworkManager fake_network_manager_;
   rtc::scoped_refptr<FakeAudioCaptureModule> fake_audio_capture_module1_;
   rtc::scoped_refptr<FakeAudioCaptureModule> fake_audio_capture_module2_;
   std::unique_ptr<OrtcFactoryInterface> ortc_factory1_;
   std::unique_ptr<OrtcFactoryInterface> ortc_factory2_;
   // Actually owned by video tracks.
   std::vector<cricket::FakeVideoCapturer*> fake_video_capturers_;
   int received_audio_frames1_ = 0;
@@ skipping 331 matching lines @@
 // BaseChannel model relies on there being a single VoiceChannel and
 // VideoChannel, and these only support a single set of codecs/etc. per
 // send/receive direction.
 
 // TODO(deadbeef): End-to-end test for simulcast, once that's supported by this
 // API.
 
 #endif  // if !defined(THREAD_SANITIZER)
 
 }  // namespace webrtc