diff options
Diffstat (limited to 'net/proxy/init_proxy_resolver.cc')
| -rw-r--r-- | net/proxy/init_proxy_resolver.cc | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/net/proxy/init_proxy_resolver.cc b/net/proxy/init_proxy_resolver.cc index 2c27dcb..ea1e475 100644 --- a/net/proxy/init_proxy_resolver.cc +++ b/net/proxy/init_proxy_resolver.cc @@ -17,14 +17,17 @@ namespace net { InitProxyResolver::InitProxyResolver(ProxyResolver* resolver, - ProxyScriptFetcher* proxy_script_fetcher) + ProxyScriptFetcher* proxy_script_fetcher, + NetLog* net_log) : resolver_(resolver), proxy_script_fetcher_(proxy_script_fetcher), ALLOW_THIS_IN_INITIALIZER_LIST(io_callback_( this, &InitProxyResolver::OnIOCompletion)), user_callback_(NULL), current_pac_url_index_(0u), - next_state_(STATE_NONE) { + next_state_(STATE_NONE), + net_log_(BoundNetLog::Make( + net_log, NetLog::SOURCE_INIT_PROXY_RESOLVER)) { } InitProxyResolver::~InitProxyResolver() { @@ -33,14 +36,10 @@ InitProxyResolver::~InitProxyResolver() { } int InitProxyResolver::Init(const ProxyConfig& config, - CompletionCallback* callback, - const BoundNetLog& net_log) { + CompletionCallback* callback) { DCHECK_EQ(STATE_NONE, next_state_); DCHECK(callback); DCHECK(config.MayRequirePACResolver()); - DCHECK(!net_log_.net_log()); - - net_log_ = net_log; net_log_.BeginEvent(NetLog::TYPE_INIT_PROXY_RESOLVER, NULL); |