Chromium Code Reviews| Index: net/proxy/proxy_service.cc |
| diff --git a/net/proxy/proxy_service.cc b/net/proxy/proxy_service.cc |
| index 73ba0eec2a2d2bc57ba1927800a4cdeea824e9c9..f1aa1c890a23c3bbd565a7ccc19c7c3edc8bdbb4 100644 |
| --- a/net/proxy/proxy_service.cc |
| +++ b/net/proxy/proxy_service.cc |
| @@ -1440,11 +1440,11 @@ int ProxyService::DidFinishResolvingProxy(const GURL& url, |
| void ProxyService::SetProxyScriptFetchers( |
| ProxyScriptFetcher* proxy_script_fetcher, |
| - DhcpProxyScriptFetcher* dhcp_proxy_script_fetcher) { |
| + scoped_ptr<DhcpProxyScriptFetcher> dhcp_proxy_script_fetcher) { |
| DCHECK(CalledOnValidThread()); |
| State previous_state = ResetProxyConfig(false); |
| proxy_script_fetcher_.reset(proxy_script_fetcher); |
| - dhcp_proxy_script_fetcher_.reset(dhcp_proxy_script_fetcher); |
| + dhcp_proxy_script_fetcher_.reset(dhcp_proxy_script_fetcher.release()); |
|
eroman
2015/08/19 22:08:39
dhcp_proxy_script_fetcher_ = dhcp_proxy_script_fet
Paritosh Kumar
2015/08/20 15:23:34
Done.
|
| if (previous_state != STATE_NONE) |
| ApplyProxyConfigIfAvailable(); |
| } |