Shift URLRequestContextStorage over to taking scoped_ptrs.

content/shell/browser/layout_test/layout_test_url_request_context_getter.cc

 // Copyright 2013 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 "content/shell/browser/layout_test/layout_test_url_request_context_getter.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/shell/browser/shell_network_delegate.h"
@@ skipping 16 matching lines @@
                                    protocol_handlers,
                                    request_interceptors.Pass(),
                                    net_log) {
   // Must first be created on the UI thread.
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 }
 
 LayoutTestURLRequestContextGetter::~LayoutTestURLRequestContextGetter() {
 }
 
-net::NetworkDelegate*
+scoped_ptr<net::NetworkDelegate>
 LayoutTestURLRequestContextGetter::CreateNetworkDelegate() {
   ShellNetworkDelegate::SetAcceptAllCookies(false);
-  return new ShellNetworkDelegate;
+  return make_scoped_ptr(new ShellNetworkDelegate);
 }
 
-net::ProxyConfigService*
+scoped_ptr<net::ProxyConfigService>
 LayoutTestURLRequestContextGetter::GetProxyConfigService() {
-  return nullptr;
+  return scoped_ptr<net::ProxyConfigService>();

[davidben, 2015/09/08 17:02:45]

You can use nullptr here.

 }
 
-net::ProxyService* LayoutTestURLRequestContextGetter::GetProxyService() {
+scoped_ptr<net::ProxyService>
+LayoutTestURLRequestContextGetter::GetProxyService() {
   return net::ProxyService::CreateDirect();
 }
 
 }  // namespace content