From d9c7f8d3a8932020a965186c0c4e95686bea6b01 Mon Sep 17 00:00:00 2001
From: magjed <magjed@webrtc.org>
Date: Tue, 26 Jul 2016 03:03:31 -0700
Subject: [PATCH] Use NullSocketServer instead of PhysicalSocketServer in
 SignalThread

BUG=webrtc:6125

Review-Url: https://codereview.webrtc.org/2164333002
Cr-Commit-Position: refs/heads/master@{#13525}
---
 webrtc/base/nethelpers.cc   | 4 ++--
 webrtc/base/signalthread.cc | 4 ++--
 webrtc/base/signalthread.h  | 9 +++++++--
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/webrtc/base/nethelpers.cc b/webrtc/base/nethelpers.cc
index 1f6bb8df7b..4bcf5b60e6 100644
--- a/webrtc/base/nethelpers.cc
+++ b/webrtc/base/nethelpers.cc
@@ -82,8 +82,8 @@ int ResolveHostname(const std::string& hostname, int family,
 }
 
 // AsyncResolver
-AsyncResolver::AsyncResolver() : error_(-1) {
-}
+AsyncResolver::AsyncResolver()
+    : SignalThread(false /* use_socket_server */), error_(-1) {}
 
 AsyncResolver::~AsyncResolver() = default;
 
diff --git a/webrtc/base/signalthread.cc b/webrtc/base/signalthread.cc
index e5dd6946aa..75f6624c87 100644
--- a/webrtc/base/signalthread.cc
+++ b/webrtc/base/signalthread.cc
@@ -18,9 +18,9 @@ namespace rtc {
 // SignalThread
 ///////////////////////////////////////////////////////////////////////////////
 
-SignalThread::SignalThread()
+SignalThread::SignalThread(bool use_socket_server)
     : main_(Thread::Current()),
-      worker_(this),
+      worker_(this, use_socket_server),
       state_(kInit),
       refcount_(1) {
   main_->SignalQueueDestroyed.connect(this,
diff --git a/webrtc/base/signalthread.h b/webrtc/base/signalthread.h
index ec250c6aad..10d727c5b0 100644
--- a/webrtc/base/signalthread.h
+++ b/webrtc/base/signalthread.h
@@ -14,6 +14,7 @@
 #include <string>
 
 #include "webrtc/base/constructormagic.h"
+#include "webrtc/base/nullsocketserver.h"
 #include "webrtc/base/sigslot.h"
 #include "webrtc/base/thread.h"
 
@@ -40,7 +41,7 @@ class SignalThread
     : public sigslot::has_slots<>,
       protected MessageHandler {
  public:
-  SignalThread();
+  explicit SignalThread(bool use_socket_server = true);
 
   // Context: Main Thread.  Call before Start to change the worker's name.
   bool SetName(const std::string& name, const void* obj);
@@ -102,7 +103,11 @@ class SignalThread
 
   class Worker : public Thread {
    public:
-    explicit Worker(SignalThread* parent) : parent_(parent) {}
+    explicit Worker(SignalThread* parent, bool use_socket_server)
+        : Thread(use_socket_server
+                     ? SocketServer::CreateDefault()
+                     : std::unique_ptr<SocketServer>(new NullSocketServer())),
+          parent_(parent) {}
     ~Worker() override;
     void Run() override;