Shift URLRequestContextStorage over to taking scoped_ptrs.

content/shell/browser/layout_test/layout_test_url_request_context_getter.cc

Index: content/shell/browser/layout_test/layout_test_url_request_context_getter.cc
diff --git a/content/shell/browser/layout_test/layout_test_url_request_context_getter.cc b/content/shell/browser/layout_test/layout_test_url_request_context_getter.cc
index 15ddd806ae08b38094124192db0851fa545b6877..27732b34165b1ec9d385c4f49f2354c197d065ba 100644
--- a/content/shell/browser/layout_test/layout_test_url_request_context_getter.cc
+++ b/content/shell/browser/layout_test/layout_test_url_request_context_getter.cc
@@ -34,18 +34,19 @@ LayoutTestURLRequestContextGetter::LayoutTestURLRequestContextGetter(
 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();
 }