Upstream changes making ListenSocket an abstract class.

net/net.gyp

Index: net/net.gyp
diff --git a/net/net.gyp b/net/net.gyp
index 69122b0f56792b0fa98d15a7c3c5098117818c9f..05c429a79e681413399399bd529fa60f59419a61 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -108,9 +108,9 @@
         'base/escape.cc',
         'base/escape.h',
         'base/escape_icu.cc',
-        'base/expiring_cache.h',
         'base/ev_root_ca_metadata.cc',
         'base/ev_root_ca_metadata.h',
+        'base/expiring_cache.h',
         'base/file_stream.cc',
         'base/file_stream.h',
         'base/file_stream_metrics.cc',
@@ -152,7 +152,6 @@
         'base/keygen_handler_nss.cc',
         'base/keygen_handler_openssl.cc',
         'base/keygen_handler_win.cc',
-        'base/listen_socket.cc',
         'base/listen_socket.h',
         'base/load_flags.h',
         'base/load_flags_list.h',
@@ -243,6 +242,8 @@
         'base/static_cookie_policy.cc',
         'base/static_cookie_policy.h',
         'base/sys_addrinfo.h',
+        'base/tcp_listen_socket.cc',
+        'base/tcp_listen_socket.h',
         'base/test_data_stream.cc',
         'base/test_data_stream.h',
         'base/test_root_certs.cc',
@@ -1051,8 +1052,6 @@
         'base/host_resolver_impl_unittest.cc',
         'base/ip_endpoint_unittest.cc',
         'base/keygen_handler_unittest.cc',
-        'base/listen_socket_unittest.cc',
-        'base/listen_socket_unittest.h',
         'base/mapped_host_resolver_unittest.cc',
         'base/mime_sniffer_unittest.cc',
         'base/mime_util_unittest.cc',
@@ -1076,6 +1075,8 @@
         'base/ssl_client_auth_cache_unittest.cc',
         'base/ssl_config_service_unittest.cc',
         'base/static_cookie_policy_unittest.cc',
+        'base/tcp_listen_socket_unittest.cc',
+        'base/tcp_listen_socket_unittest.h',
         'base/test_certificate_data.h',
         'base/test_completion_callback_unittest.cc',
         'base/transport_security_state_unittest.cc',