Shift URLRequestContextStorage over to taking scoped_ptrs.

android_webview/browser/net/aw_url_request_context_getter.cc

Index: android_webview/browser/net/aw_url_request_context_getter.cc
diff --git a/android_webview/browser/net/aw_url_request_context_getter.cc b/android_webview/browser/net/aw_url_request_context_getter.cc
index def5f81e4de7ad17a13077ba0fc88162185aa9b4..8a21c56ea3483bf3005d82dd059e411a7a42f0c2 100644
--- a/android_webview/browser/net/aw_url_request_context_getter.cc
+++ b/android_webview/browser/net/aw_url_request_context_getter.cc
@@ -217,9 +217,8 @@ void AwURLRequestContextGetter::InitializeURLRequestContext() {
   // Android provides a local HTTP proxy that handles all the proxying.
   // Create the proxy without a resolver since we rely on this local HTTP proxy.
   // TODO(sgurun) is this behavior guaranteed through SDK?
-  builder.set_proxy_service(
-      make_scoped_ptr(net::ProxyService::CreateWithoutProxyResolver(
-          proxy_config_service_.release(), net_log_.get())));
+  builder.set_proxy_service(net::ProxyService::CreateWithoutProxyResolver(
+      proxy_config_service_.release(), net_log_.get()));
   builder.set_net_log(net_log_.get());
   builder.SetCookieAndChannelIdStores(cookie_store_, NULL);
   ApplyCmdlineOverridesToURLRequestContextBuilder(&builder);