Delete method MessageQueue::set_socketserver

webrtc/p2p/base/relayport_unittest.cc

Index: webrtc/p2p/base/relayport_unittest.cc
diff --git a/webrtc/p2p/base/relayport_unittest.cc b/webrtc/p2p/base/relayport_unittest.cc
index 8574af3a74e9f4bcf8f334513cb2b2759e7e3a1a..0d699532cfbd27d74b1b75eb9c4290c717dce161 100644
--- a/webrtc/p2p/base/relayport_unittest.cc
+++ b/webrtc/p2p/base/relayport_unittest.cc
@@ -45,20 +45,19 @@ class RelayPortTest : public testing::Test,
                       public sigslot::has_slots<> {
  public:
   RelayPortTest()
-      : main_(rtc::Thread::Current()),
-        physical_socket_server_(new rtc::PhysicalSocketServer),
+      : physical_socket_server_(new rtc::PhysicalSocketServer),
         virtual_socket_server_(new rtc::VirtualSocketServer(
             physical_socket_server_.get())),
-        ss_scope_(virtual_socket_server_.get()),
+        main_(virtual_socket_server_.get()),
         network_("unittest", "unittest", rtc::IPAddress(INADDR_ANY), 32),
         socket_factory_(rtc::Thread::Current()),
         username_(rtc::CreateRandomString(16)),
         password_(rtc::CreateRandomString(16)),
-        relay_port_(cricket::RelayPort::Create(main_, &socket_factory_,
+        relay_port_(cricket::RelayPort::Create(&main_, &socket_factory_,
                                                &network_,
                                                kLocalAddress.ipaddr(),
                                                0, 0, username_, password_)),
-        relay_server_(new cricket::RelayServer(main_)) {
+        relay_server_(new cricket::RelayServer(&main_)) {
   }
 
   void OnReadPacket(rtc::AsyncPacketSocket* socket,
@@ -247,10 +246,9 @@ class RelayPortTest : public testing::Test,
 
   typedef std::map<rtc::AsyncPacketSocket*, int> PacketMap;
 
-  rtc::Thread* main_;
   std::unique_ptr<rtc::PhysicalSocketServer> physical_socket_server_;
   std::unique_ptr<rtc::VirtualSocketServer> virtual_socket_server_;
-  rtc::SocketServerScope ss_scope_;
+  rtc::AutoSocketServerThread main_;
   rtc::Network network_;
   rtc::BasicPacketSocketFactory socket_factory_;
   std::string username_;