diff options
Diffstat (limited to 'net/proxy/proxy_service.cc')
| -rw-r--r-- | net/proxy/proxy_service.cc | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/net/proxy/proxy_service.cc b/net/proxy/proxy_service.cc index beeab51..669ae083 100644 --- a/net/proxy/proxy_service.cc +++ b/net/proxy/proxy_service.cc @@ -12,7 +12,6 @@ #include "base/message_loop.h" #include "base/string_util.h" #include "googleurl/src/gurl.h" -#include "net/base/forwarding_net_log.h" #include "net/base/net_log.h" #include "net/base/net_errors.h" #include "net/base/net_util.h" @@ -157,16 +156,14 @@ class ProxyResolverFactoryForV8 : public ProxyResolverFactory { public: // |async_host_resolver|, |io_loop| and |net_log| must remain // valid for the duration of our lifetime. - // Both |async_host_resolver| and |net_log| will only be operated on - // |io_loop|. + // |async_host_resolver| will only be operated on |io_loop|. ProxyResolverFactoryForV8(HostResolver* async_host_resolver, MessageLoop* io_loop, NetLog* net_log) : ProxyResolverFactory(true /*expects_pac_bytes*/), async_host_resolver_(async_host_resolver), io_loop_(io_loop), - forwarding_net_log_( - net_log ? new ForwardingNetLog(net_log, io_loop) : NULL) { + net_log_(net_log) { } virtual ProxyResolver* CreateProxyResolver() { @@ -176,8 +173,7 @@ class ProxyResolverFactoryForV8 : public ProxyResolverFactory { new SyncHostResolverBridge(async_host_resolver_, io_loop_); ProxyResolverJSBindings* js_bindings = - ProxyResolverJSBindings::CreateDefault(sync_host_resolver, - forwarding_net_log_.get()); + ProxyResolverJSBindings::CreateDefault(sync_host_resolver, net_log_); // ProxyResolverV8 takes ownership of |js_bindings|. return new ProxyResolverV8(js_bindings); @@ -186,10 +182,7 @@ class ProxyResolverFactoryForV8 : public ProxyResolverFactory { private: HostResolver* const async_host_resolver_; MessageLoop* io_loop_; - - // Thread-safe wrapper around a non-threadsafe NetLog implementation. This - // enables the proxy resolver to emit log messages from the PAC thread. - scoped_ptr<ForwardingNetLog> forwarding_net_log_; + NetLog* net_log_; }; // Creates ProxyResolvers using a platform-specific implementation. |