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

third_party/libjingle/libjingle.gyp

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'includes': [
     '../../build/win_precompile.gypi',
   ],
   'target_defaults': {
     'defines': [
@@ skipping 178 matching lines @@
         'source/talk/base/asyncudpsocket.h',
         'source/talk/base/autodetectproxy.cc',
         'source/talk/base/autodetectproxy.h',
         'source/talk/base/base64.cc',
         'source/talk/base/base64.h',
         'source/talk/base/basicdefs.h',
         'source/talk/base/basicpacketsocketfactory.cc',
         'source/talk/base/basicpacketsocketfactory.h',
         'source/talk/base/bytebuffer.cc',
         'source/talk/base/bytebuffer.h',
-        'source/talk/base/byteorder.h',
+        # TODO(ronghuawu): Remove below overrides once below bug is fixed:
+        # http://crbug.com/115702
+        'overrides/talk/base/byteorder.h',

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

nit: Please move all overrides above next to all other overrides. That way you
wouldn't have to duplicate this comment in three places.

[Ronghua Wu (Left Chromium), 2012/02/28 23:16:57]

Done, can't move the one inside the condition though.

         'source/talk/base/checks.cc',
         'source/talk/base/checks.h',
         'source/talk/base/common.cc',
         'source/talk/base/common.h',
         'source/talk/base/criticalsection.h',
         'source/talk/base/cryptstring.h',
         'source/talk/base/diskcache.cc',
         'source/talk/base/diskcache.h',
         'source/talk/base/event.cc',
         'source/talk/base/event.h',
@@ skipping 18 matching lines @@
         'source/talk/base/httprequest.h',
         'source/talk/base/ipaddress.cc',
         'source/talk/base/ipaddress.h',
         'source/talk/base/json.cc',
         'source/talk/base/json.h',
         'source/talk/base/linked_ptr.h',
         'source/talk/base/md5.h',
         'source/talk/base/md5c.c',
         'source/talk/base/messagehandler.cc',
         'source/talk/base/messagehandler.h',
-        'source/talk/base/messagequeue.cc',
-        'source/talk/base/messagequeue.h',
+        # TODO(ronghuawu): Remove below overrides once below bug is fixed:
+        # http://crbug.com/115702
+        'overrides/talk/base/messagequeue.cc',
+        'overrides/talk/base/messagequeue.h',
         'source/talk/base/nethelpers.cc',
         'source/talk/base/nethelpers.h',
         'source/talk/base/network.cc',
         'source/talk/base/network.h',
         'source/talk/base/pathutils.cc',
         'source/talk/base/pathutils.h',
         'source/talk/base/physicalsocketserver.cc',
         'source/talk/base/physicalsocketserver.h',
         'source/talk/base/proxydetect.cc',
         'source/talk/base/proxydetect.h',
@@ skipping 30 matching lines @@
         'source/talk/base/stringencode.cc',
         'source/talk/base/stringencode.h',
         'source/talk/base/stringutils.cc',
         'source/talk/base/stringutils.h',
         'source/talk/base/task.cc',
         'source/talk/base/task.h',
         'source/talk/base/taskparent.cc',
         'source/talk/base/taskparent.h',
         'source/talk/base/taskrunner.cc',
         'source/talk/base/taskrunner.h',
-        'source/talk/base/thread.cc',
-        'source/talk/base/thread.h',
+        # TODO(ronghuawu): Remove below overrides once below bug is fixed:
+        # http://crbug.com/115702
+        'overrides/talk/base/thread.cc',
+        'overrides/talk/base/thread.h',
         'source/talk/base/timeutils.cc',
         'source/talk/base/timeutils.h',
         'source/talk/base/timing.cc',
         'source/talk/base/timing.h',
         'source/talk/base/urlencode.cc',
         'source/talk/base/urlencode.h',
         'source/talk/base/worker.cc',
         'source/talk/base/worker.h',
         'source/talk/xmllite/qname.cc',
         'source/talk/xmllite/qname.h',
@@ skipping 40 matching lines @@
       ],
       'export_dependent_settings': [
         '<(DEPTH)/third_party/jsoncpp/jsoncpp.gyp:jsoncpp',
       ],
       'conditions': [
         ['OS=="win"', {
           'sources': [
             'overrides/talk/base/win32socketinit.cc',
             'source/talk/base/schanneladapter.cc',
             'source/talk/base/schanneladapter.h',
-            'source/talk/base/win32.h',
-            'source/talk/base/win32.cc',
+            # TODO(ronghuawu): Remove below overrides once below bug is fixed:
+            # http://crbug.com/115702
+            'overrides/talk/base/win32.h',
+            'overrides/talk/base/win32.cc',
             'source/talk/base/win32filesystem.cc',
             'source/talk/base/win32filesystem.h',
             'source/talk/base/win32window.h',
             'source/talk/base/win32window.cc',
             'source/talk/base/win32securityerrors.cc',
             'source/talk/base/winfirewall.cc',
             'source/talk/base/winfirewall.h',
             'source/talk/base/winping.cc',
             'source/talk/base/winping.h',
           ],
@@ skipping 234 matching lines @@
             '<(DEPTH)/third_party/webrtc/voice_engine/voice_engine.gyp:voice_engine_core',
             '<(DEPTH)/third_party/webrtc/system_wrappers/source/system_wrappers.gyp:system_wrappers',
             'libjingle',
             'libjingle_p2p',
           ],
         }],
       ],
     },  # target libjingle_peerconnection
   ],
 }