Make UrlRequestContextBuilder take scoped_ptr's

mojo/services/network/network_context.cc

 // Copyright 2014 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 "mojo/services/network/network_context.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/base_paths.h"
@@ skipping 150 matching lines @@
   }
   builder.set_http_network_session_params(params);
 
   if (command_line->HasSwitch(kHostResolverRules)) {
     scoped_ptr<net::HostResolver> host_resolver(
         net::HostResolver::CreateDefaultResolver(nullptr));
     scoped_ptr<net::MappedHostResolver> remapped_host_resolver(
         new net::MappedHostResolver(host_resolver.Pass()));
     remapped_host_resolver->SetRulesFromString(
         command_line->GetSwitchValueASCII(kHostResolverRules));
-    host_resolver.reset(remapped_host_resolver.release());
-    builder.set_host_resolver(host_resolver.release());
+    builder.set_host_resolver(remapped_host_resolver.Pass());
   }
 
   builder.set_accept_language("en-us,en");
   builder.set_user_agent(mojo::common::GetUserAgent());
-  builder.set_proxy_service(net::ProxyService::CreateDirect());
+  builder.set_proxy_service(make_scoped_ptr(net::ProxyService::CreateDirect()));
   builder.set_transport_security_persister_path(base_path);
 
   net::URLRequestContextBuilder::HttpCacheParams cache_params;
 #if defined(OS_ANDROID)
   // On Android, we store the cache on disk becase we can run only a single
   // instance of the shell at a time.
   cache_params.type = net::URLRequestContextBuilder::HttpCacheParams::DISK;
   cache_params.path = base_path.Append(FILE_PATH_LITERAL("Cache"));
 #else
   // On desktop, we store the cache in memory so we can run many shells
@@ skipping 15 matching lines @@
             delegate,
             base::FilePath(FILE_PATH_LITERAL("Cookies")),
             base::MessageLoop::current()->task_runner(),
             background_task_runner,
             false,  // TODO(erg): Make RESTORED_SESSION_COOKIES configurable.
             nullptr);
     builder.SetCookieAndChannelIdStores(
         new net::CookieMonster(cookie_store, nullptr), nullptr);
   }
 
-  return make_scoped_ptr(builder.Build());
+  return builder.Build().Pass();
 }
 
 }  // namespace mojo