Delete method MessageQueue::set_socketserver

webrtc/base/thread.h

 /*
  *  Copyright 2004 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.
  */
 
@@ skipping 293 matching lines @@
 
 class AutoThread : public Thread {
  public:
   AutoThread();
   ~AutoThread() override;
 
  private:
   RTC_DISALLOW_COPY_AND_ASSIGN(AutoThread);
 };
 
-// Provides an easy way to install/uninstall a socketserver on a thread.
-class SocketServerScope {
+// AutoSocketServerThread automatically installs itself at
+// construction uninstalls at destruction. If a Thread object is
+// already associated with the current OS thread, it is temporarily
+// disassociated and restored by the destructor.
+
+class AutoSocketServerThread : public Thread {

[tommi, 2017/04/27 13:57:07]

if this is only for tests, can we indicate that in the name?  E.g.
AutoSocketServerThreadForTesting

[nisse-webrtc, 2017/04/27 14:08:56]

It's *almost* test-only ;-/

It's used by peerconnection_client on linux. While the corresponding windows
code uses rtc::ThreadManager::Instance()->SetCurrentThread() directly. Not sure
what's most appropriate for an example.

I'm also not very fond of the name. I tried for consistenct with the related
AutoThread. But ScopedSomething would be more consistent with other webrtc
classes.

  public:
-  explicit SocketServerScope(SocketServer* ss) {
-    old_ss_ = Thread::Current()->socketserver();
-    Thread::Current()->set_socketserver(ss);
-  }
-  ~SocketServerScope() {
-    Thread::Current()->set_socketserver(old_ss_);
-  }
+  explicit AutoSocketServerThread(SocketServer* ss);
+  ~AutoSocketServerThread() override;
 
  private:
-  SocketServer* old_ss_;
+ private:

[tommi, 2017/04/27 13:57:07]

super private? :)

[nisse-webrtc, 2017/04/27 14:08:56]

Top-secret! And deleted.

+  rtc::Thread* old_thread_;
 
-  RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(SocketServerScope);
+  RTC_DISALLOW_COPY_AND_ASSIGN(AutoSocketServerThread);
 };
 
 }  // namespace rtc
 
 #endif  // WEBRTC_BASE_THREAD_H_