commit 44461fa5cbecd556691b0ba963f95973f6abece1
author henrika@webrtc.org <henrika@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Mon Jan 13 09:35:02 2014 +0000
committer henrika@webrtc.org <henrika@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Mon Jan 13 09:35:02 2014 +0000
tree cf45bc26abe9708bf59e1b110b3a4aab53af1a23
parent 8bc4fcfeb603a7236d3770a63d0107d1629b9f83

Revert 5367 "Update talk to 59410372."

> Update talk to 59410372.
> 
> R=jiayl@webrtc.org, wu@webrtc.org
> 
> Review URL: https://webrtc-codereview.appspot.com/6929004

TBR=mallinath@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/6999004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5371 4adac7df-926f-26a2-2b94-8c16560cd09d

talk/base/messagequeue.cc

diff --git a/talk/base/messagequeue.cc b/talk/base/messagequeue.cc
index 64e63ae..15b700f 100644
--- a/talk/base/messagequeue.cc
+++ b/talk/base/messagequeue.cc
@@ -32,13 +32,8 @@
 #include "talk/base/common.h"
 #include "talk/base/logging.h"
 #include "talk/base/messagequeue.h"
-#if defined(__native_client__)
-#include "talk/base/nullsocketserver.h"
-typedef talk_base::NullSocketServer DefaultSocketServer;
-#else
 #include "talk/base/physicalsocketserver.h"
-typedef talk_base::PhysicalSocketServer DefaultSocketServer;
-#endif
+
 
 namespace talk_base {
 
@@ -134,7 +129,7 @@
     // server, and provide it to the MessageQueue, since the Thread controls
     // the I/O model, and MQ is agnostic to those details.  Anyway, this causes
     // messagequeue_unittest to depend on network libraries... yuck.
-    default_ss_.reset(new DefaultSocketServer());
+    default_ss_.reset(new PhysicalSocketServer());
     ss_ = default_ss_.get();
   }
   ss_->SetMessageQueue(this);