diff options
| author | Ben Murdoch <benm@google.com> | 2010-11-18 18:32:45 +0000 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-11-18 18:38:07 +0000 |
| commit | 513209b27ff55e2841eac0e4120199c23acce758 (patch) | |
| tree | aeba30bb08c5f47c57003544e378a377c297eee6 /net/proxy/proxy_service.cc | |
| parent | 164f7496de0fbee436b385a79ead9e3cb81a50c1 (diff) | |
| download | external_chromium-513209b27ff55e2841eac0e4120199c23acce758.zip external_chromium-513209b27ff55e2841eac0e4120199c23acce758.tar.gz external_chromium-513209b27ff55e2841eac0e4120199c23acce758.tar.bz2 | |
Merge Chromium at r65505: Initial merge by git.
Change-Id: I31d8f1d8cd33caaf7f47ffa7350aef42d5fbdb45
Diffstat (limited to 'net/proxy/proxy_service.cc')
| -rw-r--r-- | net/proxy/proxy_service.cc | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/net/proxy/proxy_service.cc b/net/proxy/proxy_service.cc index 5e11ef1..b4aa96d 100644 --- a/net/proxy/proxy_service.cc +++ b/net/proxy/proxy_service.cc @@ -525,8 +525,8 @@ int ProxyService::ResolveProxy(const GURL& raw_url, if (rv != ERR_IO_PENDING) return DidFinishResolvingProxy(result, rv, net_log); - scoped_refptr<PacRequest> req = - new PacRequest(this, url, result, callback, net_log); + scoped_refptr<PacRequest> req( + new PacRequest(this, url, result, callback, net_log)); if (current_state_ == STATE_READY) { // Start the resolve request. @@ -715,13 +715,15 @@ int ProxyService::DidFinishResolvingProxy(ProxyInfo* result, if (net_log.IsLoggingAllEvents()) { net_log.AddEvent( NetLog::TYPE_PROXY_SERVICE_RESOLVED_PROXY_LIST, - new NetLogStringParameter("pac_string", result->ToPacString())); + make_scoped_refptr(new NetLogStringParameter( + "pac_string", result->ToPacString()))); } result->DeprioritizeBadProxies(proxy_retry_info_); } else { net_log.AddEvent( NetLog::TYPE_PROXY_SERVICE_RESOLVED_PROXY_LIST, - new NetLogIntegerParameter("net_error", result_code)); + make_scoped_refptr(new NetLogIntegerParameter( + "net_error", result_code))); // Fall-back to direct when the proxy resolver fails. This corresponds // with a javascript runtime error in the PAC script. @@ -831,8 +833,8 @@ ProxyConfigService* ProxyService::CreateSystemProxyConfigService( void ProxyService::OnProxyConfigChanged(const ProxyConfig& config) { // Emit the proxy settings change to the NetLog stream. if (net_log_) { - scoped_refptr<NetLog::EventParameters> params = - new ProxyConfigChangedNetLogParam(fetched_config_, config); + scoped_refptr<NetLog::EventParameters> params( + new ProxyConfigChangedNetLogParam(fetched_config_, config)); net_log_->AddEntry(net::NetLog::TYPE_PROXY_CONFIG_CHANGED, base::TimeTicks::Now(), NetLog::Source(), |