Remove VirtualSocketServer's dependency on PhysicalSocketServer.

webrtc/pc/rtcstats_integrationtest.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 <set>
 #include <vector>
 
 #include "webrtc/api/audio_codecs/builtin_audio_decoder_factory.h"
 #include "webrtc/api/datachannelinterface.h"
 #include "webrtc/api/peerconnectioninterface.h"
 #include "webrtc/api/stats/rtcstats_objects.h"
 #include "webrtc/api/stats/rtcstatsreport.h"
 #include "webrtc/base/checks.h"
 #include "webrtc/base/gunit.h"
-#include "webrtc/base/physicalsocketserver.h"
 #include "webrtc/base/refcountedobject.h"
 #include "webrtc/base/scoped_ref_ptr.h"
 #include "webrtc/base/virtualsocketserver.h"
 #include "webrtc/pc/test/peerconnectiontestwrapper.h"
 #include "webrtc/pc/test/rtcstatsobtainer.h"
 
 namespace webrtc {
 
 namespace {
 
 const int64_t kGetStatsTimeoutMs = 10000;
 
 class RTCStatsIntegrationTest : public testing::Test {
  public:
   RTCStatsIntegrationTest()
-      : physical_socket_server_(),
-        virtual_socket_server_(&physical_socket_server_),
-        network_thread_(&virtual_socket_server_),
-        worker_thread_() {
+      : network_thread_(&virtual_socket_server_), worker_thread_() {
     RTC_CHECK(network_thread_.Start());
     RTC_CHECK(worker_thread_.Start());
 
     caller_ = new rtc::RefCountedObject<PeerConnectionTestWrapper>(
         "caller", &network_thread_, &worker_thread_);
     callee_ = new rtc::RefCountedObject<PeerConnectionTestWrapper>(
         "callee", &network_thread_, &worker_thread_);
   }
 
   void StartCall() {
@@ skipping 38 matching lines @@
  protected:
   static rtc::scoped_refptr<const RTCStatsReport> GetStats(
       PeerConnectionInterface* pc) {
     rtc::scoped_refptr<RTCStatsObtainer> stats_obtainer =
         RTCStatsObtainer::Create();
     pc->GetStats(stats_obtainer);
     EXPECT_TRUE_WAIT(stats_obtainer->report(), kGetStatsTimeoutMs);
     return stats_obtainer->report();
   }
 
-  // These objects use each other and must be constructed/destroyed in this
-  // order. Relationship:
-  // |physical_socket_server_| <- |virtual_socket_server_| <- |network_thread_|
-  rtc::PhysicalSocketServer physical_socket_server_;
+  // |network_thread_| uses |virtual_socket_server_| so they must be
+  // constructed/destructed in the correct order.
   rtc::VirtualSocketServer virtual_socket_server_;
   rtc::Thread network_thread_;
   rtc::Thread worker_thread_;
   rtc::scoped_refptr<PeerConnectionTestWrapper> caller_;
   rtc::scoped_refptr<PeerConnectionTestWrapper> callee_;
 };
 
 class RTCStatsVerifier {
  public:
   RTCStatsVerifier(const RTCStatsReport* report, const RTCStats* stats)
@@ skipping 533 matching lines @@
   caller_ = nullptr;
   // Any pending stats requests should have completed in the act of destroying
   // the peer connection.
   EXPECT_TRUE(stats_obtainer->report());
 }
 #endif  // HAVE_SCTP
 
 }  // namespace
 
 }  // namespace webrtc