Delete method MessageQueue::set_socketserver

webrtc/p2p/base/turnserver_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 "webrtc/base/gunit.h"
 #include "webrtc/base/physicalsocketserver.h"
 #include "webrtc/base/virtualsocketserver.h"
 #include "webrtc/p2p/base/basicpacketsocketfactory.h"
 #include "webrtc/p2p/base/turnserver.h"
 
 // NOTE: This is a work in progress. Currently this file only has tests for
 // TurnServerConnection, a primitive class used by TurnServer.
 
 namespace cricket {
 
 class TurnServerConnectionTest : public testing::Test {
  public:
-  TurnServerConnectionTest() : vss_(&pss_), ss_scope_(&vss_) {}
+  TurnServerConnectionTest() : vss_(&pss_), thread_(&vss_) {}
 
   void ExpectEqual(const TurnServerConnection& a,
                    const TurnServerConnection& b) {
     EXPECT_TRUE(a == b);
     EXPECT_FALSE(a < b);
     EXPECT_FALSE(b < a);
   }
 
   void ExpectNotEqual(const TurnServerConnection& a,
                       const TurnServerConnection& b) {
     EXPECT_FALSE(a == b);
     // We don't care which is less than the other, as long as only one is less
     // than the other.
     EXPECT_TRUE((a < b) != (b < a));
   }
 
  protected:
   rtc::PhysicalSocketServer pss_;
   rtc::VirtualSocketServer vss_;
-  rtc::SocketServerScope ss_scope_;
-  // Since this is constructed after |ss_scope_|, it will pick up |ss_scope_|'s
+  rtc::AutoSocketServerThread thread_;
+  // Since this is constructed after |sct_|, it will pick up |threads_|'s
   // socket server.
   rtc::BasicPacketSocketFactory socket_factory_;
 };
 
 TEST_F(TurnServerConnectionTest, ComparisonOperators) {
   std::unique_ptr<rtc::AsyncPacketSocket> socket1(
       socket_factory_.CreateUdpSocket(rtc::SocketAddress("1.1.1.1", 1), 0, 0));
   std::unique_ptr<rtc::AsyncPacketSocket> socket2(
       socket_factory_.CreateUdpSocket(rtc::SocketAddress("2.2.2.2", 2), 0, 0));
   TurnServerConnection connection1(socket2->GetLocalAddress(), PROTO_UDP,
                                    socket1.get());
   TurnServerConnection connection2(socket2->GetLocalAddress(), PROTO_UDP,
                                    socket1.get());
   TurnServerConnection connection3(socket1->GetLocalAddress(), PROTO_UDP,
                                    socket2.get());
   TurnServerConnection connection4(socket2->GetLocalAddress(), PROTO_TCP,
                                    socket1.get());
   ExpectEqual(connection1, connection2);
   ExpectNotEqual(connection1, connection3);
   ExpectNotEqual(connection1, connection4);
 }
 
 }  // namespace cricket