Delete method MessageQueue::set_socketserver

webrtc/base/thread.cc

Index: webrtc/base/thread.cc
diff --git a/webrtc/base/thread.cc b/webrtc/base/thread.cc
index 9a71c1aa3fd352130677641d54b2ff8a79ce5d96..471460987aed87e44964de1867ccad669c2e1889 100644
--- a/webrtc/base/thread.cc
+++ b/webrtc/base/thread.cc
@@ -528,4 +528,15 @@ AutoThread::~AutoThread() {
   }
 }
 
+AutoSocketServerThread::AutoSocketServerThread(SocketServer* ss)
+    : Thread(ss) {
+  old_thread_ = ThreadManager::Instance()->CurrentThread();

[Taylor Brandstetter, 2017/04/28 02:59:34]

Does it need to do this? Or can it do "DCHECK(!CurrentThread())"? I tried this,
and all the tests I tried running passed.

[nisse-webrtc, 2017/04/28 09:46:52]

PhysicalSocketTest is part of the webrtc_nonparallel_tests binary. If I add a
DCHECK(old_thread == nullptr), running that test binary fails with 

[----------] 38 tests from PhysicalSocketTest
[ RUN      ] PhysicalSocketTest.TestConnectIPv4


#
# Fatal error in ../../webrtc/base/thread.cc, line 534
# last system error: 2
# Check failed: old_thread_ == nullptr
# 
#

[Taylor Brandstetter, 2017/04/28 16:59:45]

I wasn't thinking when I left this comment; I was testing with gtest-parallel
which will create a fresh process for every test. But of course, some tests
still end up auto-wrapping, so if a test run afterwards doesn't do
auto-wrapping, you run into this.

However: we may still want to call "MessageQueueManager::Remove/Add" for the old
thread, so it at least doesn't appear in the MessageQueueManager list while it's
in this limbo state.

+  rtc::ThreadManager::Instance()->SetCurrentThread(this);
+}
+
+AutoSocketServerThread::~AutoSocketServerThread() {
+  RTC_DCHECK(ThreadManager::Instance()->CurrentThread() == this);
+  rtc::ThreadManager::Instance()->SetCurrentThread(old_thread_);
+}
+
 }  // namespace rtc