make ProxyService::CreateSystemProxyConfigService return scoped_ptrs

net/proxy/proxy_service.h

Index: net/proxy/proxy_service.h
diff --git a/net/proxy/proxy_service.h b/net/proxy/proxy_service.h
index ee74252b1eb9202ce9ce0083f21afd54773efd2a..dc33bed5764cb18473e48c6c11b2b61eef187526 100644
--- a/net/proxy/proxy_service.h
+++ b/net/proxy/proxy_service.h
@@ -95,7 +95,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);
 
@@ -205,7 +205,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|.

[mmenke, 2015/09/18 18:58:54]

nit:  No longer need the last sentence.

[Charlie Harrison, 2015/09/18 19:56:06]

Done.

-  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() {
@@ -236,13 +237,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
@@ -265,7 +266,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);