| Index: net/net.gypi
|
| diff --git a/net/net.gypi b/net/net.gypi
|
| index 3f21d89f0c2c569db437bf0dc5b94b03042eff9a..219e7e1a1cf291cb92bc6d497ca8b5df6784b4aa 100644
|
| --- a/net/net.gypi
|
| +++ b/net/net.gypi
|
| @@ -163,12 +163,12 @@
|
| 'ssl/channel_id_service.h',
|
| 'ssl/channel_id_store.cc',
|
| 'ssl/channel_id_store.h',
|
| + 'ssl/client_key_store.cc',
|
| + 'ssl/client_key_store.h',
|
| 'ssl/default_channel_id_store.cc',
|
| 'ssl/default_channel_id_store.h',
|
| 'ssl/openssl_client_key_store.cc',
|
| 'ssl/openssl_client_key_store.h',
|
| - 'ssl/client_key_store.cc',
|
| - 'ssl/client_key_store.h',
|
| 'ssl/openssl_ssl_util.cc',
|
| 'ssl/openssl_ssl_util.h',
|
| 'ssl/signed_certificate_timestamp_and_status.cc',
|
| @@ -485,13 +485,13 @@
|
| 'base/network_change_notifier_win.h',
|
| 'base/network_config_watcher_mac.cc',
|
| 'base/network_config_watcher_mac.h',
|
| - 'base/network_interfaces_linux.cc',
|
| - 'base/network_interfaces_mac.cc',
|
| - 'base/network_interfaces_win.cc',
|
| 'base/network_delegate.cc',
|
| 'base/network_delegate.h',
|
| 'base/network_delegate_impl.cc',
|
| 'base/network_delegate_impl.h',
|
| + 'base/network_interfaces_linux.cc',
|
| + 'base/network_interfaces_mac.cc',
|
| + 'base/network_interfaces_win.cc',
|
| 'base/network_quality_estimator.cc',
|
| 'base/network_quality_estimator.h',
|
| 'base/nss_memio.c',
|
| @@ -526,10 +526,10 @@
|
| 'base/upload_bytes_element_reader.h',
|
| 'base/upload_data_stream.cc',
|
| 'base/upload_data_stream.h',
|
| - 'base/upload_element_reader.cc',
|
| - 'base/upload_element_reader.h',
|
| 'base/upload_disk_cache_entry_element_reader.cc',
|
| 'base/upload_disk_cache_entry_element_reader.h',
|
| + 'base/upload_element_reader.cc',
|
| + 'base/upload_element_reader.h',
|
| 'base/upload_file_element_reader.cc',
|
| 'base/upload_file_element_reader.h',
|
| 'base/upload_progress.h',
|
| @@ -720,12 +720,12 @@
|
| 'disk_cache/simple/simple_entry_impl.h',
|
| 'disk_cache/simple/simple_entry_operation.cc',
|
| 'disk_cache/simple/simple_entry_operation.h',
|
| - 'log/write_to_file_net_log_observer.cc',
|
| - 'log/write_to_file_net_log_observer.h',
|
| 'log/net_log_util.cc',
|
| 'log/net_log_util.h',
|
| 'log/trace_net_log_observer.cc',
|
| 'log/trace_net_log_observer.h',
|
| + 'log/write_to_file_net_log_observer.cc',
|
| + 'log/write_to_file_net_log_observer.h',
|
| 'disk_cache/simple/simple_histogram_macros.h' ,
|
| 'cert_net/nss_ocsp.cc',
|
| 'cert_net/nss_ocsp.h',
|
| @@ -1011,10 +1011,10 @@
|
| 'socket/server_socket.h',
|
| 'socket/socket_descriptor.cc',
|
| 'socket/socket_descriptor.h',
|
| - 'socket/socket_libevent.cc',
|
| - 'socket/socket_libevent.h',
|
| 'socket/socket_net_log_params.cc',
|
| 'socket/socket_net_log_params.h',
|
| + 'socket/socket_posix.cc',
|
| + 'socket/socket_posix.h',
|
| 'socket/socks5_client_socket.cc',
|
| 'socket/socks5_client_socket.h',
|
| 'socket/socks_client_socket.cc',
|
| @@ -1035,8 +1035,8 @@
|
| 'socket/tcp_server_socket.cc',
|
| 'socket/tcp_server_socket.h',
|
| 'socket/tcp_socket.h',
|
| - 'socket/tcp_socket_libevent.cc',
|
| - 'socket/tcp_socket_libevent.h',
|
| + 'socket/tcp_socket_posix.cc',
|
| + 'socket/tcp_socket_posix.h',
|
| 'socket/tcp_socket_win.cc',
|
| 'socket/tcp_socket_win.h',
|
| 'socket/transport_client_socket_pool.cc',
|
| @@ -1075,9 +1075,9 @@
|
| 'spdy/hpack/hpack_static_table.h',
|
| 'spdy/hpack/hpack_string_util.cc',
|
| 'spdy/hpack/hpack_string_util.h',
|
| - 'spdy/spdy_bitmasks.h',
|
| - 'spdy/spdy_alt_svc_wire_format.h',
|
| 'spdy/spdy_alt_svc_wire_format.cc',
|
| + 'spdy/spdy_alt_svc_wire_format.h',
|
| + 'spdy/spdy_bitmasks.h',
|
| 'spdy/spdy_buffer.cc',
|
| 'spdy/spdy_buffer.h',
|
| 'spdy/spdy_buffer_producer.cc',
|
| @@ -1132,8 +1132,8 @@
|
| 'ssl/ssl_platform_key_mac.cc',
|
| 'ssl/ssl_platform_key_nss.cc',
|
| 'ssl/ssl_platform_key_win.cc',
|
| - 'ssl/threaded_ssl_private_key.h',
|
| 'ssl/threaded_ssl_private_key.cc',
|
| + 'ssl/threaded_ssl_private_key.h',
|
| 'third_party/mozilla_security_manager/nsKeygenHandler.cpp',
|
| 'third_party/mozilla_security_manager/nsKeygenHandler.h',
|
| 'third_party/mozilla_security_manager/nsNSSCertificateDB.cpp',
|
| @@ -1150,8 +1150,8 @@
|
| 'udp/udp_server_socket.cc',
|
| 'udp/udp_server_socket.h',
|
| 'udp/udp_socket.h',
|
| - 'udp/udp_socket_libevent.cc',
|
| - 'udp/udp_socket_libevent.h',
|
| + 'udp/udp_socket_posix.cc',
|
| + 'udp/udp_socket_posix.h',
|
| 'udp/udp_socket_win.cc',
|
| 'udp/udp_socket_win.h',
|
| 'url_request/certificate_report_sender.cc',
|
| @@ -1180,6 +1180,8 @@
|
| 'url_request/url_range_request_job.h',
|
| 'url_request/url_request.cc',
|
| 'url_request/url_request.h',
|
| + 'url_request/url_request_backoff_manager.cc',
|
| + 'url_request/url_request_backoff_manager.h',
|
| 'url_request/url_request_context.cc',
|
| 'url_request/url_request_context.h',
|
| 'url_request/url_request_context_builder.cc',
|
| @@ -1224,8 +1226,6 @@
|
| 'url_request/url_request_throttler_entry_interface.h',
|
| 'url_request/url_request_throttler_manager.cc',
|
| 'url_request/url_request_throttler_manager.h',
|
| - 'url_request/url_request_backoff_manager.cc',
|
| - 'url_request/url_request_backoff_manager.h',
|
| 'url_request/view_cache_helper.cc',
|
| 'url_request/view_cache_helper.h',
|
| 'url_request/websocket_handshake_userdata_key.cc',
|
| @@ -1325,8 +1325,8 @@
|
| 'cookies/cookie_util_unittest.cc',
|
| 'cookies/parsed_cookie_unittest.cc',
|
| 'der/input_unittest.cc',
|
| - 'der/parser_unittest.cc',
|
| 'der/parse_values_unittest.cc',
|
| + 'der/parser_unittest.cc',
|
| 'disk_cache/backend_unittest.cc',
|
| 'disk_cache/blockfile/addr_unittest.cc',
|
| 'disk_cache/blockfile/bitmap_unittest.cc',
|
| @@ -1417,9 +1417,9 @@
|
| 'http/http_server_properties_impl_unittest.cc',
|
| 'http/http_server_properties_manager_unittest.cc',
|
| 'http/http_status_code_unittest.cc',
|
| + 'http/http_status_line_validator_unittest.cc',
|
| 'http/http_stream_factory_impl_request_unittest.cc',
|
| 'http/http_stream_factory_impl_unittest.cc',
|
| - 'http/http_status_line_validator_unittest.cc',
|
| 'http/http_stream_parser_unittest.cc',
|
| 'http/http_util_unittest.cc',
|
| 'http/http_vary_data_unittest.cc',
|
|
|