Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(23)

Unified Diff: net/proxy/proxy_service.cc

Issue 11275088: Remove implicit scoped_refptr operator T* Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/proxy/network_delegate_error_observer_unittest.cc ('k') | net/proxy/proxy_service_v8.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/proxy/proxy_service.cc
diff --git a/net/proxy/proxy_service.cc b/net/proxy/proxy_service.cc
index a834d82732cd81defdad633b6b7e7d0e3e65b2d1..e65954f2169268283ca485ba9ca9fb2e32091061 100644
--- a/net/proxy/proxy_service.cc
+++ b/net/proxy/proxy_service.cc
@@ -677,7 +677,7 @@ class ProxyService::ProxyScriptDeciderPoller {
// Otherwise if it succeeded both this time and last time, we need to look
// closer and see if we ended up downloading different content for the PAC
// script.
- return !script_data->Equals(last_script_data_);
+ return !script_data->Equals(last_script_data_.get());
}
void NotifyProxyServiceOfChange(
@@ -685,7 +685,7 @@ class ProxyService::ProxyScriptDeciderPoller {
const scoped_refptr<ProxyResolverScriptData>& script_data,
const ProxyConfig& effective_config) {
// Note that |this| may be deleted after calling into the ProxyService.
- change_callback_.Run(result, script_data, effective_config);
+ change_callback_.Run(result, script_data.get(), effective_config);
}
base::WeakPtrFactory<ProxyScriptDeciderPoller> weak_factory_;
@@ -987,7 +987,7 @@ int ProxyService::ResolveProxy(const GURL& raw_url,
}
DCHECK_EQ(ERR_IO_PENDING, rv);
- DCHECK(!ContainsPendingRequest(req));
+ DCHECK(!ContainsPendingRequest(req.get()));
pending_requests_.push_back(req);
// Completion will be notified through |callback|, unless the caller cancels
@@ -1357,7 +1357,7 @@ ProxyConfigService* ProxyService::CreateSystemProxyConfigService(
// notifications (delivered in either |glib_default_loop| or
// |file_loop|) to keep us updated when the proxy config changes.
linux_config_service->SetupAndFetchInitialConfig(
- glib_thread_task_runner, io_thread_task_runner,
+ glib_thread_task_runner.get(), io_thread_task_runner,
static_cast<MessageLoopForIO*>(file_loop));
return linux_config_service;
« no previous file with comments | « net/proxy/network_delegate_error_observer_unittest.cc ('k') | net/proxy/proxy_service_v8.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698