Enable socketservers unittests on windows

webrtc/webrtc_tests.gypi

 # Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
 #
 # Use of this source code is governed by a BSD-style license
 # that can be found in the LICENSE file in the root of the source
 # tree. An additional intellectual property rights grant can be found
 # in the file PATENTS.  All contributing project authors may
 # be found in the AUTHORS file in the root of the source tree.
 {
   'targets': [
     {
@@ skipping 453 matching lines @@
             '<(DEPTH)/testing/android/native_test.gyp:native_test_native_code',
           ],
         }],
       ],
     },
     {
       'target_name': 'webrtc_nonparallel_tests',
       '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',
       ],
       'defines': [
         'GTEST_RELATIVE_PATH',
       ],
       'dependencies': [
         '<(DEPTH)/testing/gtest.gyp:gtest',
         'base/base.gyp:rtc_base',
         'test/test.gyp:test_main',
       ],
       'conditions': [
         ['OS=="android"', {
           'dependencies': [
             '<(DEPTH)/testing/android/native_test.gyp:native_test_native_code',
           ],
         }],
         ['OS=="win"', {
           'sources': [
-              # 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',
+            'base/win32socketserver_unittest.cc',
           ],
         }],
         ['OS=="mac"', {
           'sources': [
             'base/macsocketserver_unittest.cc',
           ],
         }],
         ['OS=="ios" or (OS=="mac" and target_arch!="ia32")', {
           'defines': [
             'CARBON_DEPRECATED=YES',
@@ skipping 153 matching lines @@
             'build/isolate.gypi',
           ],
           'sources': [
             'webrtc_perf_tests.isolate',
           ],
         },
       ],
     }],
   ],
 }