make ProxyService::CreateSystemProxyConfigService return scoped_ptrs

chromecast/browser/url_request_context_factory.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 "chromecast/browser/url_request_context_factory.h"
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/macros.h"
 #include "base/threading/worker_pool.h"
@@ skipping 134 matching lines @@
 
 void URLRequestContextFactory::InitializeOnUIThread(net::NetLog* net_log) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   // Cast http user agent settings must be initialized in UI thread
   // because it registers itself to pref notification observer which is not
   // thread safe.
   http_user_agent_settings_.reset(new CastHttpUserAgentSettings());
 
   // Proxy config service should be initialized in UI thread, since
   // ProxyConfigServiceDelegate on Android expects UI thread.
-  proxy_config_service_.reset(net::ProxyService::CreateSystemProxyConfigService(
+  proxy_config_service_ = net::ProxyService::CreateSystemProxyConfigService(
       content::BrowserThread::GetMessageLoopProxyForThread(
           content::BrowserThread::IO),
       content::BrowserThread::GetMessageLoopProxyForThread(
-          content::BrowserThread::FILE)));
+          content::BrowserThread::FILE));
 
   net_log_ = net_log;
 }
 
 net::URLRequestContextGetter* URLRequestContextFactory::CreateMainGetter(
     content::BrowserContext* browser_context,
     content::ProtocolHandlerMap* protocol_handlers,
     content::URLRequestInterceptorScopedVector request_interceptors) {
   DCHECK(!main_getter_.get())
       << "Main URLRequestContextGetter already initialized";
@@ skipping 40 matching lines @@
 
   ssl_config_service_ = new net::SSLConfigServiceDefaults;
 
   transport_security_state_.reset(new net::TransportSecurityState());
   http_auth_handler_factory_ =
       net::HttpAuthHandlerFactory::CreateDefault(host_resolver_.get());
 
   http_server_properties_.reset(new net::HttpServerPropertiesImpl);
 
   proxy_service_ = net::ProxyService::CreateUsingSystemProxyResolver(
-      proxy_config_service_.release(), 0, NULL);
+      proxy_config_service_.Pass(), 0, NULL);
   system_dependencies_initialized_ = true;
 }
 
 void URLRequestContextFactory::InitializeMainContextDependencies(
     net::HttpTransactionFactory* transaction_factory,
     content::ProtocolHandlerMap* protocol_handlers,
     content::URLRequestInterceptorScopedVector request_interceptors) {
   if (main_dependencies_initialized_)
     return;
 
@@ skipping 177 matching lines @@
 
 void URLRequestContextFactory::InitializeNetworkDelegates() {
   app_network_delegate_->Initialize(false);
   LOG(INFO) << "Initialized app network delegate.";
   system_network_delegate_->Initialize(false);
   LOG(INFO) << "Initialized system network delegate.";
 }
 
 }  // namespace shell
 }  // namespace chromecast