make ProxyService::CreateSystemProxyConfigService return scoped_ptrs

net/proxy/proxy_service.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef NET_PROXY_PROXY_SERVICE_H_
 #define NET_PROXY_PROXY_SERVICE_H_
 
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 74 matching lines @@
     // by the preceding poll, or a negative TimeDelta value if determining
     // the delay for the initial poll. |initial_error| is the network error
     // code that the last PAC fetch (or WPAD initialization) failed with,
     // or OK if it completed successfully. Implementations must set
     // |next_delay| to a non-negative value.
     virtual Mode GetNextDelay(int initial_error,
                               base::TimeDelta current_delay,
                               base::TimeDelta* next_delay) const = 0;
   };
 
   // The instance takes ownership of |config_service| and |resolver_factory|.

[Randy Smith (Not in Mondays), 2015/09/18 20:14:55]

I think this comment is no longer needed; the same info's contained in the
signature.  (Apologies--I suspect this is partially cleanup from my CL.)

[Charlie Harrison, 2015/09/21 16:47:05]

Done.

   // |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);
 
   ~ProxyService() override;
 
   // Used internally to handle PAC queries.
   // TODO(eroman): consider naming this simply "Request".
   class PacRequest;
 
   // Returns ERR_IO_PENDING if the proxy information could not be provided
@@ skipping 87 matching lines @@
   // is needed if the ProxyResolver is of type ProxyResolverWithoutFetch.
   // ProxyService takes ownership of proxy_script_fetcher.
   void SetProxyScriptFetchers(
       ProxyScriptFetcher* proxy_script_fetcher,
       scoped_ptr<DhcpProxyScriptFetcher> dhcp_proxy_script_fetcher);
   ProxyScriptFetcher* GetProxyScriptFetcher() const;
 
   // Tells this ProxyService to start using a new ProxyConfigService to
   // retrieve its ProxyConfig from. The new ProxyConfigService will immediately
   // 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);
+  // ResolveProxy calls.
+  void ResetConfigService(
+      scoped_ptr<ProxyConfigService> new_proxy_config_service);
 
   // Returns the last configuration fetched from ProxyConfigService.
   const ProxyConfig& fetched_config() {
     return fetched_config_;
   }
 
   // Returns the current configuration being used by ProxyConfigService.
   const ProxyConfig& config() const {
     return config_;
   }
@@ skipping 10 matching lines @@
 
   // Forces refetching the proxy configuration, and applying it.
   // This re-does everything from fetching the system configuration,
   // to downloading and testing the PAC files.
   void ForceReloadProxyConfig();
 
   // Same as CreateProxyServiceUsingV8ProxyResolver, except it uses system
   // 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
   // specified fixed settings.
   static scoped_ptr<ProxyService> CreateFixed(const ProxyConfig& pc);
   static scoped_ptr<ProxyService> CreateFixed(const std::string& proxy);
 
   // Creates a proxy service that uses a DIRECT connection for all requests.
   static scoped_ptr<ProxyService> CreateDirect();
   // |net_log|'s lifetime must exceed ProxyService.
   static scoped_ptr<ProxyService> CreateDirectWithNetLog(NetLog* net_log);
 
   // This method is used by tests to create a ProxyService that returns a
   // hardcoded proxy fallback list (|pac_string|) for every URL.
   //
   // |pac_string| is a list of proxy servers, in the format that a PAC script
   // would return it. For example, "PROXY foobar:99; SOCKS fml:2; DIRECT"
   static scoped_ptr<ProxyService> CreateFixedFromPacResult(
       const std::string& pac_string);
 
   // 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);
 
   // This method should only be used by unit tests.
   void set_stall_proxy_auto_config_delay(base::TimeDelta delay) {
     stall_proxy_auto_config_delay_ = delay;
   }
 
   // This method should only be used by unit tests. Returns the previously
   // active policy.
@@ skipping 171 matching lines @@
 
   // Whether child ProxyScriptDeciders should use QuickCheck
   bool quick_check_enabled_;
 
   DISALLOW_COPY_AND_ASSIGN(ProxyService);
 };
 
 }  // namespace net
 
 #endif  // NET_PROXY_PROXY_SERVICE_H_