commit 7eaa4ea75f8d3440b735c0b8311b4c9c7997763d
author nisse <nisse@webrtc.org> Mon May 08 05:25:41 2017 -0700
committer Commit bot <commit-bot@chromium.org> Mon May 08 12:25:41 2017 +0000
tree d6a95252830b32f88e068ca2b888ec811c310a39
parent d2690ddfff9202ee3caad5ba3a6ac125160cfcd5

Delete method MessageQueue::set_socketserver

Instead, make the pointer to the associated socket server a
construction time const, and delete its lock.

Introduces a helper class AutoSocketServerThread for code
(mainly tests) which need a socket server associated with
the current thread.

BUG=webrtc:7501

Review-Url: https://codereview.webrtc.org/2828223002
Cr-Commit-Position: refs/heads/master@{#18047}

webrtc/base/messagequeue.h

diff --git a/webrtc/base/messagequeue.h b/webrtc/base/messagequeue.h
index 20e2e13..e39c9f9 100644
--- a/webrtc/base/messagequeue.h
+++ b/webrtc/base/messagequeue.h
@@ -26,7 +26,6 @@
 #include "webrtc/base/location.h"
 #include "webrtc/base/messagehandler.h"
 #include "webrtc/base/scoped_ref_ptr.h"
-#include "webrtc/base/sharedexclusivelock.h"
 #include "webrtc/base/sigslot.h"
 #include "webrtc/base/socketserver.h"
 #include "webrtc/base/timeutils.h"
@@ -210,7 +209,6 @@
   virtual ~MessageQueue();
 
   SocketServer* socketserver();
-  void set_socketserver(SocketServer* ss);
 
   // Note: The behavior of MessageQueue has changed.  When a MQ is stopped,
   // futher Posts and Sends will fail.  However, any pending Sends and *ready*
@@ -317,10 +315,9 @@
   volatile int stop_;
 
   // The SocketServer might not be owned by MessageQueue.
-  SocketServer* ss_ GUARDED_BY(ss_lock_);
+  SocketServer* const ss_;
   // Used if SocketServer ownership lies with |this|.
   std::unique_ptr<SocketServer> own_ss_;
-  SharedExclusiveLock ss_lock_;
 
   RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(MessageQueue);
 };