Shift URLRequestContextStorage over to taking 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 <string>
 #include <vector>
 
@@ skipping 76 matching lines @@
     // 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|.
   // |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,

[pauljensen, 2015/08/28 13:38:02]

Would really be nice to make this a scoped_ptr while making changes here.

[Randy Smith (Not in Mondays), 2015/09/02 23:42:19]

See other comment; being done in separate CL.

                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 119 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 ProxyService* CreateUsingSystemProxyResolver(
+  static scoped_ptr<ProxyService> CreateUsingSystemProxyResolver(
       ProxyConfigService* proxy_config_service,
       size_t num_pac_threads,
       NetLog* net_log);
 
   // Creates a ProxyService without support for proxy autoconfig.
-  static ProxyService* CreateWithoutProxyResolver(
+  static scoped_ptr<ProxyService> CreateWithoutProxyResolver(
       ProxyConfigService* proxy_config_service,
       NetLog* net_log);
 
   // Convenience methods that creates a proxy service using the
   // specified fixed settings.
-  static ProxyService* CreateFixed(const ProxyConfig& pc);
-  static ProxyService* CreateFixed(const std::string& proxy);
+  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 ProxyService* CreateDirect();
+  static scoped_ptr<ProxyService> CreateDirect();
   // |net_log|'s lifetime must exceed ProxyService.
-  static ProxyService* CreateDirectWithNetLog(NetLog* net_log);
+  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 ProxyService* CreateFixedFromPacResult(const std::string& pac_string);
+  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(
       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;
@@ skipping 179 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_