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

Unified Diff: net/proxy/proxy_service.h

Issue 1301333002: make ProxyService::CreateSystemProxyConfigService return scoped_ptrs NOT FOR REVIEW (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: try merging again... Created 5 years, 4 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/http/http_network_transaction_unittest.cc ('k') | net/proxy/proxy_service.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/proxy/proxy_service.h
diff --git a/net/proxy/proxy_service.h b/net/proxy/proxy_service.h
index ed14a5348e1b0a1e0a4528d005a73d065c9c4651..d0cb48253aa17d30649a045edbdbe5f151f860e5 100644
--- a/net/proxy/proxy_service.h
+++ b/net/proxy/proxy_service.h
@@ -94,7 +94,7 @@ class NET_EXPORT ProxyService : public NetworkChangeNotifier::IPAddressObserver,
// The instance takes ownership of |config_service| and |resolver_factory|.
// |net_log| is a possibly NULL destination to send log events to. It must
// remain alive for the lifetime of this ProxyService.
- ProxyService(ProxyConfigService* config_service,
+ ProxyService(scoped_ptr<ProxyConfigService> config_service,
scoped_ptr<ProxyResolverFactory> resolver_factory,
NetLog* net_log);
@@ -204,7 +204,8 @@ class NET_EXPORT ProxyService : public NetworkChangeNotifier::IPAddressObserver,
// be queried for new config info which will be used for all subsequent
// ResolveProxy calls. ProxyService takes ownership of
// |new_proxy_config_service|.
- void ResetConfigService(ProxyConfigService* new_proxy_config_service);
+ void ResetConfigService(
+ scoped_ptr<ProxyConfigService> new_proxy_config_service);
// Returns the last configuration fetched from ProxyConfigService.
const ProxyConfig& fetched_config() {
@@ -235,13 +236,13 @@ class NET_EXPORT ProxyService : public NetworkChangeNotifier::IPAddressObserver,
// libraries for evaluating the PAC script if available, otherwise skips
// proxy autoconfig.
static scoped_ptr<ProxyService> CreateUsingSystemProxyResolver(
- ProxyConfigService* proxy_config_service,
+ scoped_ptr<ProxyConfigService> proxy_config_service,
size_t num_pac_threads,
NetLog* net_log);
// Creates a ProxyService without support for proxy autoconfig.
static scoped_ptr<ProxyService> CreateWithoutProxyResolver(
- ProxyConfigService* proxy_config_service,
+ scoped_ptr<ProxyConfigService> proxy_config_service,
NetLog* net_log);
// Convenience methods that creates a proxy service using the
@@ -264,7 +265,7 @@ class NET_EXPORT ProxyService : public NetworkChangeNotifier::IPAddressObserver,
// Creates a config service appropriate for this platform that fetches the
// system proxy settings.
- static ProxyConfigService* CreateSystemProxyConfigService(
+ static scoped_ptr<ProxyConfigService> CreateSystemProxyConfigService(
const scoped_refptr<base::SingleThreadTaskRunner>& io_task_runner,
const scoped_refptr<base::SingleThreadTaskRunner>& file_task_runner);
« no previous file with comments | « net/http/http_network_transaction_unittest.cc ('k') | net/proxy/proxy_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698