Index: net/proxy/proxy_service_v8.cc |
diff --git a/net/proxy/proxy_service_v8.cc b/net/proxy/proxy_service_v8.cc |
index 60916771ab677aef315aafb3f36ecac5f04edc3a..3634613ccde6503f4c3bf61f83d922dfd2469b3d 100644 |
--- a/net/proxy/proxy_service_v8.cc |
+++ b/net/proxy/proxy_service_v8.cc |
@@ -14,38 +14,6 @@ |
#include "net/proxy/proxy_service.h" |
namespace net { |
-namespace { |
- |
-class ProxyResolverFactoryForV8Resolver : public LegacyProxyResolverFactory { |
- public: |
- explicit ProxyResolverFactoryForV8Resolver(HostResolver* host_resolver, |
- NetLog* net_log, |
- NetworkDelegate* network_delegate) |
- : LegacyProxyResolverFactory(true), |
- host_resolver_(host_resolver), |
- net_log_(net_log), |
- network_delegate_(network_delegate) {} |
- |
- // LegacyProxyResolverFactory override. |
- scoped_ptr<ProxyResolver> CreateProxyResolver() override { |
- DCHECK(thread_checker_.CalledOnValidThread()); |
- ProxyResolverErrorObserver* error_observer = |
- new NetworkDelegateErrorObserver( |
- network_delegate_, base::ThreadTaskRunnerHandle::Get().get()); |
- return make_scoped_ptr( |
- new ProxyResolverV8Tracing(host_resolver_, error_observer, net_log_)); |
- } |
- |
- private: |
- HostResolver* const host_resolver_; |
- NetLog* const net_log_; |
- NetworkDelegate* const network_delegate_; |
- |
- base::ThreadChecker thread_checker_; |
- |
- DISALLOW_COPY_AND_ASSIGN(ProxyResolverFactoryForV8Resolver); |
-}; |
-} // namespace |
// static |
ProxyService* CreateProxyServiceUsingV8ProxyResolver( |
@@ -60,11 +28,13 @@ ProxyService* CreateProxyServiceUsingV8ProxyResolver( |
DCHECK(dhcp_proxy_script_fetcher); |
DCHECK(host_resolver); |
- ProxyService* proxy_service = |
- new ProxyService(proxy_config_service, |
- make_scoped_ptr(new ProxyResolverFactoryForV8Resolver( |
- host_resolver, net_log, network_delegate)), |
- net_log); |
+ ProxyService* proxy_service = new ProxyService( |
+ proxy_config_service, |
+ make_scoped_ptr(new ProxyResolverFactoryV8Tracing( |
+ host_resolver, net_log, ProxyResolver::LoadStateChangedCallback(), |
+ base::Bind(&NetworkDelegateErrorObserver::Create, network_delegate, |
+ base::ThreadTaskRunnerHandle::Get()))), |
+ net_log); |
// Configure fetchers to use for PAC script downloads and auto-detect. |
proxy_service->SetProxyScriptFetchers(proxy_script_fetcher, |