| Index: net/net.gyp
|
| ===================================================================
|
| --- net/net.gyp (revision 51891)
|
| +++ net/net.gyp (working copy)
|
| @@ -396,8 +396,6 @@
|
| 'ocsp/nss_ocsp.h',
|
| 'proxy/init_proxy_resolver.cc',
|
| 'proxy/init_proxy_resolver.h',
|
| - 'proxy/multi_threaded_proxy_resolver.cc',
|
| - 'proxy/multi_threaded_proxy_resolver.h',
|
| 'proxy/proxy_bypass_rules.cc',
|
| 'proxy/proxy_bypass_rules.h',
|
| 'proxy/proxy_config.cc',
|
| @@ -433,6 +431,8 @@
|
| 'proxy/proxy_server.h',
|
| 'proxy/proxy_service.cc',
|
| 'proxy/proxy_service.h',
|
| + 'proxy/single_threaded_proxy_resolver.cc',
|
| + 'proxy/single_threaded_proxy_resolver.h',
|
| 'proxy/sync_host_resolver_bridge.cc',
|
| 'proxy/sync_host_resolver_bridge.h',
|
| 'socket/client_socket.h',
|
| @@ -723,7 +723,6 @@
|
| 'http/url_security_manager_unittest.cc',
|
| 'proxy/init_proxy_resolver_unittest.cc',
|
| 'proxy/mock_proxy_resolver.h',
|
| - 'proxy/multi_threaded_proxy_resolver_unittest.cc',
|
| 'proxy/proxy_bypass_rules_unittest.cc',
|
| 'proxy/proxy_config_service_linux_unittest.cc',
|
| 'proxy/proxy_config_service_win_unittest.cc',
|
| @@ -734,6 +733,7 @@
|
| 'proxy/proxy_script_fetcher_unittest.cc',
|
| 'proxy/proxy_server_unittest.cc',
|
| 'proxy/proxy_service_unittest.cc',
|
| + 'proxy/single_threaded_proxy_resolver_unittest.cc',
|
| 'proxy/sync_host_resolver_bridge_unittest.cc',
|
| 'socket/client_socket_pool_base_unittest.cc',
|
| 'socket/socks5_client_socket_unittest.cc',
|
|
|