Index: net/proxy/proxy_service.h |
diff --git a/net/proxy/proxy_service.h b/net/proxy/proxy_service.h |
index e0f807777d3fdb81a61d2d37282b8fafa51306b0..fe34f134167bbb800c588871159f351c8a3d4690 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 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 ProxyService* CreateWithoutProxyResolver( |
- ProxyConfigService* proxy_config_service, |
+ scoped_ptr<ProxyConfigService> proxy_config_service, |
NetLog* net_log); |
// Convenience methods that creates a proxy service using the |
@@ -263,7 +264,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); |