Reland Enable socketservers unittests on windows.

webrtc/BUILD.gn

 # Copyright (c) 2014 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.
 
 # TODO(kjellander): Rebase this to webrtc/build/common.gypi changes after r6330.
 
@@ skipping 725 matching lines @@
 
   test("webrtc_nonparallel_tests") {
     testonly = true
     configs += [
       ":common_config",
       ":rtc_unittests_config",
     ]
     public_configs = [ ":common_inherited_config" ]
     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",
     ]
     deps = [
       "base:rtc_base",
       "base:rtc_base_tests_utils",
       "//testing/gtest",
     ]
     if (is_win) {
-      # TODO(ronghuawu): Fix TestUdpReadyToSendIPv6 on windows bot then reenable
-      # these tests.
-      # sources += [ "base/win32socketserver_unittest.cc" ]
-    } else {
-      # 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",
-      ]
+      sources += [ "base/win32socketserver_unittest.cc" ]
     }
     if (is_android) {
       deps += [ "//testing/android/native_test:native_test_support" ]
     }
 
     if (is_mac) {
       sources += [ "base/macsocketserver_unittest.cc" ]
     }
     if (is_ios || (is_mac && target_cpu != "x86")) {
       defines = [ "CARBON_DEPRECATED=YES" ]
     }
     if (is_clang) {
       # Suppress warnings from the Chromium Clang plugin.
       # See http://code.google.com/p/webrtc/issues/detail?id=163 for details.
       configs -= [ "//build/config/clang:find_bad_constructs" ]
     }
   }
 }