Remove the dependency to ws2_32.dll from talk_base::ThreadManager and talk_base::Thread.

third_party/libjingle/overrides/talk/base/messagequeue.cc

 /*
  * libjingle
  * Copyright 2004--2005, Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  *  1. Redistributions of source code must retain the above copyright notice,
  *     this list of conditions and the following disclaimer.
  *  2. Redistributions in binary form must reproduce the above copyright notice,
@@ skipping 26 matching lines @@
 #include "talk/base/logging.h"
 #include "talk/base/messagequeue.h"
 #include "talk/base/physicalsocketserver.h"
 
 
 namespace talk_base {
 
 const uint32 kMaxMsgLatency = 150;  // 150 ms
 
 //------------------------------------------------------------------
+// DummySocketServer
+
+class DummySocketServer : public talk_base::SocketServer {

[Sergey Ulanov, 2012/02/28 07:14:32]

May be better to call it NullSocketServer

[Ronghua Wu (Left Chromium), 2012/02/28 17:50:47]

Done.

+  virtual bool Wait(int cms, bool process_io) OVERRIDE {
+    return false;

[Sergey Ulanov, 2012/02/28 07:14:32]

That doesn't look right. I think that message queue without a socket server
should still work as expected. This class should use talk_base::Event. Wait()
should just call Event::Wait.

[Ronghua Wu (Left Chromium), 2012/02/28 17:50:47]

Done.

+  }
+
+  virtual void WakeUp() OVERRIDE {

[Sergey Ulanov, 2012/02/28 07:14:32]

This should signal event that Wait() waits on.

[Ronghua Wu (Left Chromium), 2012/02/28 17:50:47]

Done.

+  }
+
+  virtual talk_base::Socket* CreateSocket(int type) OVERRIDE {
+    return NULL;
+  }
+
+  // Returns a new socket for nonblocking communication.  The type can be
+  // SOCK_DGRAM and SOCK_STREAM.

[Sergey Ulanov, 2012/02/28 07:14:32]

s/and/or/

[Ronghua Wu (Left Chromium), 2012/02/28 17:50:47]

Done.

+  virtual talk_base::AsyncSocket* CreateAsyncSocket(int type) OVERRIDE {
+    return NULL;
+  }
+};
+
+//------------------------------------------------------------------
 // MessageQueueManager
 
 MessageQueueManager* MessageQueueManager::instance_;
 
 MessageQueueManager* MessageQueueManager::Instance() {
   // Note: This is not thread safe, but it is first called before threads are
   // spawned.
   if (!instance_)
     instance_ = new MessageQueueManager;
   return instance_;
@@ skipping 41 matching lines @@
   ASSERT(!crit_.CurrentThreadIsOwner());  // See note above.
   CritScope cs(&crit_);
   std::vector<MessageQueue *>::iterator iter;
   for (iter = message_queues_.begin(); iter != message_queues_.end(); iter++)
     (*iter)->Clear(handler);
 }
 
 //------------------------------------------------------------------
 // MessageQueue
 
-MessageQueue::MessageQueue(SocketServer* ss)
-    : ss_(ss), fStop_(false), fPeekKeep_(false), active_(false),
-      dmsgq_next_num_(0) {
-  if (!ss_) {
-    // Currently, MessageQueue holds a socket server, and is the base class for
-    // Thread.  It seems like it makes more sense for Thread to hold the socket
-    // 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 PhysicalSocketServer());
-    ss_ = default_ss_.get();
+MessageQueue::MessageQueue() {
+  // Currently, MessageQueue holds a socket server, and is the base class for
+  // Thread.  It seems like it makes more sense for Thread to hold the socket
+  // 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.

[Sergey Ulanov, 2012/02/28 07:14:32]

mark this as TODO?

+  default_ss_.reset(new PhysicalSocketServer());
+  Construct();
+}
+
+MessageQueue::MessageQueue(SocketServer* ss) {
+  if (!ss) {
+    default_ss_.reset(new DummySocketServer());
   }
+  Construct();
+}
+
+void MessageQueue::Construct() {
+  fStop_ = false;
+  fPeekKeep_ = false;
+  active_ = false;
+  dmsgq_next_num_ = 0;
+  ss_ = default_ss_.get();

[Sergey Ulanov, 2012/02/28 07:14:32]

Why not set this in the constructor? That way you wouldn't need that field.

[Ronghua Wu (Left Chromium), 2012/02/28 17:50:47]

If a socket server is passed from external, the MessageQueue won't take the
ownership of it.

[Sergey Ulanov, 2012/02/28 21:54:01]

In that case it's better to rename owned_ss_ (to be consistent with other code)
and set ss_ in the constructor.

   ss_->SetMessageQueue(this);
 }
 
 MessageQueue::~MessageQueue() {
   // The signal is done from here to ensure
   // that it always gets called when the queue
   // is going away.
   SignalQueueDestroyed();
   if (active_) {
     MessageQueueManager::Instance()->Remove(this);
@@ skipping 244 matching lines @@
 
 void MessageQueue::EnsureActive() {
   ASSERT(crit_.CurrentThreadIsOwner());
   if (!active_) {
     active_ = true;
     MessageQueueManager::Instance()->Add(this);
   }
 }
 
 }  // namespace talk_base