Shift URLRequestContextStorage over to taking scoped_ptrs.

net/proxy/proxy_service_mojo.cc

Index: net/proxy/proxy_service_mojo.cc
diff --git a/net/proxy/proxy_service_mojo.cc b/net/proxy/proxy_service_mojo.cc
index 92f8938824213adf4188bdd9bd1aa51026bf8fe9..0205f133491abaf48f47fc06c86f0d040d0b4e34 100644
--- a/net/proxy/proxy_service_mojo.cc
+++ b/net/proxy/proxy_service_mojo.cc
@@ -5,6 +5,7 @@
 #include "net/proxy/proxy_service_mojo.h"
 
 #include "base/logging.h"
+#include "base/memory/scoped_ptr.h"
 #include "base/thread_task_runner_handle.h"
 #include "net/dns/mojo_host_resolver_impl.h"
 #include "net/interfaces/proxy_resolver_service.mojom.h"
@@ -19,7 +20,7 @@
 
 namespace net {
 
-ProxyService* CreateProxyServiceUsingMojoFactory(
+scoped_ptr<ProxyService> CreateProxyServiceUsingMojoFactory(
     MojoProxyResolverFactory* mojo_proxy_factory,
     ProxyConfigService* proxy_config_service,
     ProxyScriptFetcher* proxy_script_fetcher,
@@ -32,14 +33,14 @@ ProxyService* CreateProxyServiceUsingMojoFactory(
   DCHECK(dhcp_proxy_script_fetcher);
   DCHECK(host_resolver);
 
-  ProxyService* proxy_service = new ProxyService(
+  scoped_ptr<ProxyService> proxy_service(new ProxyService(
       proxy_config_service,
       make_scoped_ptr(new ProxyResolverFactoryMojo(
           mojo_proxy_factory, host_resolver,
           base::Bind(&NetworkDelegateErrorObserver::Create, network_delegate,
                      base::ThreadTaskRunnerHandle::Get()),
           net_log)),
-      net_log);
+      net_log));
 
   // Configure fetchers to use for PAC script downloads and auto-detect.
   proxy_service->SetProxyScriptFetchers(proxy_script_fetcher,
@@ -48,7 +49,7 @@ ProxyService* CreateProxyServiceUsingMojoFactory(
   return proxy_service;
 }
 
-ProxyService* CreateProxyServiceUsingMojoInProcess(
+scoped_ptr<ProxyService> CreateProxyServiceUsingMojoInProcess(
     ProxyConfigService* proxy_config_service,
     ProxyScriptFetcher* proxy_script_fetcher,
     scoped_ptr<DhcpProxyScriptFetcher> dhcp_proxy_script_fetcher,