Index: net/proxy/proxy_service_v8.cc |
diff --git a/net/proxy/proxy_service_v8.cc b/net/proxy/proxy_service_v8.cc |
index eac36ec0e3b0cbc576411943c4c83f09c6ae56bd..0ddcf729e29421159b8490294b91a2227babd52e 100644 |
--- a/net/proxy/proxy_service_v8.cc |
+++ b/net/proxy/proxy_service_v8.cc |
@@ -15,29 +15,25 @@ |
namespace net { |
namespace { |
-class ProxyResolverFactoryForV8Resolver : public LegacyProxyResolverFactory { |
+class ProxyResolverFactoryForV8Resolver : public ProxyResolverFactoryV8Tracing { |
public: |
explicit ProxyResolverFactoryForV8Resolver(HostResolver* host_resolver, |
NetLog* net_log, |
NetworkDelegate* network_delegate) |
- : LegacyProxyResolverFactory(true), |
- host_resolver_(host_resolver), |
- net_log_(net_log), |
+ : ProxyResolverFactoryV8Tracing( |
+ host_resolver, |
+ net_log, |
+ ProxyResolver::LoadStateChangedCallback()), |
network_delegate_(network_delegate) {} |
- // LegacyProxyResolverFactory override. |
- scoped_ptr<ProxyResolver> CreateProxyResolver() override { |
+ // ProxyResolverFactory override. |
+ scoped_ptr<ProxyResolverErrorObserver> CreateErrorObserver() override { |
DCHECK(thread_checker_.CalledOnValidThread()); |
- ProxyResolverErrorObserver* error_observer = |
- new NetworkDelegateErrorObserver( |
- network_delegate_, base::MessageLoopProxy::current().get()); |
- return make_scoped_ptr( |
- new ProxyResolverV8Tracing(host_resolver_, error_observer, net_log_)); |
+ return make_scoped_ptr(new NetworkDelegateErrorObserver( |
+ network_delegate_, base::MessageLoopProxy::current().get())); |
} |
private: |
- HostResolver* const host_resolver_; |
- NetLog* const net_log_; |
NetworkDelegate* const network_delegate_; |
base::ThreadChecker thread_checker_; |