1 files changed, 7 insertions, 2 deletions
diff --git a/third_party/libjingle/overrides/talk/base/messagequeue.h b/third_party/libjingle/overrides/talk/base/messagequeue.h
index 2857182..634fa2a 100644
--- a/third_party/libjingle/overrides/talk/base/messagequeue.h
+++ b/third_party/libjingle/overrides/talk/base/messagequeue.h
@@ -171,9 +171,14 @@ class DelayedMessage {
 
 class MessageQueue {
  public:
-  explicit MessageQueue(SocketServer* ss = NULL);
+  // A phiscal socket server will be created for this ctor.
+  MessageQueue();
+  // If |ss| is NULL, a dummy socket server will be created.
+  explicit MessageQueue(SocketServer* ss);
   virtual ~MessageQueue();
 
+  void Construct();
+
   SocketServer* socketserver() { return ss_; }
   void set_socketserver(SocketServer* ss);
 
@@ -240,7 +245,7 @@ class MessageQueue {
   // The SocketServer is not owned by MessageQueue.
   SocketServer* ss_;
   // If a server isn't supplied in the constructor, use this one.
-  scoped_ptr<SocketServer> default_ss_;
+  scoped_ptr<SocketServer> owned_ss_;
   bool fStop_;
   bool fPeekKeep_;
   Message msgPeek_;