Reland Enable socketservers unittests on windows.

webrtc/BUILD.gn

Index: webrtc/BUILD.gn
diff --git a/webrtc/BUILD.gn b/webrtc/BUILD.gn
index 2ba3e94583bd6022ba9e8c8ab7626f6d2fba59b1..2a4adf8f6563ad03b254fff96f365ab4acce87ba 100644
--- a/webrtc/BUILD.gn
+++ b/webrtc/BUILD.gn
@@ -743,6 +743,9 @@ if (rtc_include_tests) {
     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",
     ]
@@ -752,17 +755,7 @@ if (rtc_include_tests) {
       "//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" ]