Revert of Enable socketservers unittests on windows

webrtc/webrtc_tests.gypi

Index: webrtc/webrtc_tests.gypi
diff --git a/webrtc/webrtc_tests.gypi b/webrtc/webrtc_tests.gypi
index a05b2141cc84a6f99d2a02d61a3632033686e3e5..811c4474742894b14b0113daacc846939739fdbc 100644
--- a/webrtc/webrtc_tests.gypi
+++ b/webrtc/webrtc_tests.gypi
@@ -471,9 +471,6 @@
       'type': '<(gtest_target_type)',
       'sources': [
         'base/nullsocketserver_unittest.cc',
-        'base/physicalsocketserver_unittest.cc',
-        'base/socket_unittest.cc',
-        'base/socket_unittest.h',
         'base/socketaddress_unittest.cc',
         'base/virtualsocket_unittest.cc',
       ],
@@ -493,7 +490,17 @@
         }],
         ['OS=="win"', {
           'sources': [
-            'base/win32socketserver_unittest.cc',
+              # TODO(ronghuawu): Fix TestUdpReadyToSendIPv6 on windows bot
+              # then reenable these tests.
+              # 'base/win32socketserver_unittest.cc',
+          ],
+        }, {
+          # TODO(pbos): Move test disabling to ifdefs within the test files
+          # instead of here.
+          'sources': [
+            'base/physicalsocketserver_unittest.cc',
+            'base/socket_unittest.cc',
+            'base/socket_unittest.h',
           ],
         }],
         ['OS=="mac"', {