Shift URLRequestContextStorage over to taking scoped_ptrs.

chrome/browser/net/proxy_service_factory.cc

 // 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.
 
 #include "chrome/browser/net/proxy_service_factory.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/metrics/field_trial.h"
@@ skipping 96 matching lines @@
 #if defined(OS_CHROMEOS)
   return new chromeos::ProxyConfigServiceImpl(NULL, local_state_prefs);
 #else
   return new PrefProxyConfigTrackerImpl(
       local_state_prefs,
       BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO));
 #endif  // defined(OS_CHROMEOS)
 }
 
 // static
-net::ProxyService* ProxyServiceFactory::CreateProxyService(
+scoped_ptr<net::ProxyService> ProxyServiceFactory::CreateProxyService(
     net::NetLog* net_log,
     net::URLRequestContext* context,
     net::NetworkDelegate* network_delegate,
     net::ProxyConfigService* proxy_config_service,
     const base::CommandLine& command_line,
     bool quick_check_enabled) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
 #if defined(OS_IOS)
   bool use_v8 = false;
 #else
@@ skipping 16 matching lines @@
 
     // Parse the switch (it should be a positive integer formatted as decimal).
     int n;
     if (base::StringToInt(s, &n) && n > 0) {
       num_pac_threads = static_cast<size_t>(n);
     } else {
       LOG(ERROR) << "Invalid switch for number of PAC threads: " << s;
     }
   }
 
-  net::ProxyService* proxy_service = NULL;
+  scoped_ptr<net::ProxyService> proxy_service;
   if (use_v8) {
 #if defined(OS_IOS)
     NOTREACHED();
 #else
     scoped_ptr<net::DhcpProxyScriptFetcher> dhcp_proxy_script_fetcher;
 #if defined(OS_CHROMEOS)
     dhcp_proxy_script_fetcher.reset(
         new chromeos::DhcpProxyScriptFetcherChromeos(context));
 #else
     net::DhcpProxyScriptFetcherFactory dhcp_factory;
@@ skipping 28 matching lines @@
     proxy_service = net::ProxyService::CreateUsingSystemProxyResolver(
         proxy_config_service,
         num_pac_threads,
         net_log);
   }
 
   proxy_service->set_quick_check_enabled(quick_check_enabled);
 
   return proxy_service;
 }