make ProxyService::CreateSystemProxyConfigService return scoped_ptrs

chrome/browser/net/proxy_service_factory.cc

 // Copyright (c) 2012 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 "chrome/browser/net/proxy_service_factory.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/metrics/field_trial.h"
@@ skipping 39 matching lines @@
     return false;
   if (command_line.HasSwitch(switches::kV8PacMojoOutOfProcess))
     return true;
   return group_name == "Enabled";
 }
 #endif  // !defined(OS_ANDROID)
 
 }  // namespace
 
 // static
-net::ProxyConfigService* ProxyServiceFactory::CreateProxyConfigService(
-    PrefProxyConfigTracker* tracker) {
+scoped_ptr<net::ProxyConfigService>
+ProxyServiceFactory::CreateProxyConfigService(PrefProxyConfigTracker* tracker) {
   // The linux gconf-based proxy settings getter relies on being initialized
   // from the UI thread.
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   scoped_ptr<net::ProxyConfigService> base_service;
 
 #if !defined(OS_CHROMEOS)
   // On ChromeOS, base service is NULL; chromeos::ProxyConfigServiceImpl
   // determines the effective proxy config to take effect in the network layer,
   // be it from prefs or system (which is network shill on chromeos).
 
   // For other platforms, create a baseline service that provides proxy
   // configuration in case nothing is configured through prefs (Note: prefs
   // include command line and configuration policy).
 
   // TODO(port): the IO and FILE message loops are only used by Linux.  Can
   // that code be moved to chrome/browser instead of being in net, so that it
   // can use BrowserThread instead of raw MessageLoop pointers? See bug 25354.
-  base_service.reset(net::ProxyService::CreateSystemProxyConfigService(
+  base_service = net::ProxyService::CreateSystemProxyConfigService(
       BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO),
-      BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE)));
+      BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE));
 #endif  // !defined(OS_CHROMEOS)
 
-  return tracker->CreateTrackingProxyConfigService(base_service.Pass())
-      .release();
+  return tracker->CreateTrackingProxyConfigService(base_service.Pass()).Pass();

[Randy Smith (Not in Mondays), 2015/09/18 20:14:55]

If the return type of CreateTrackingProxyConfigService is ProxyConfigService (as
opposed to some subclass), you don't need the .Pass(); the compiler figures out
that it's going out of scope and hence that a straight assignment is legal.

[Charlie Harrison, 2015/09/21 16:47:04]

Done.

 }
 
 // static
 PrefProxyConfigTracker*
 ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile(
     PrefService* profile_prefs,
     PrefService* local_state_prefs) {
 #if defined(OS_CHROMEOS)
   return new chromeos::ProxyConfigServiceImpl(profile_prefs, local_state_prefs);
 #else
@@ skipping 14 matching lines @@
       local_state_prefs,
       BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO));
 #endif  // defined(OS_CHROMEOS)
 }
 
 // static
 scoped_ptr<net::ProxyService> ProxyServiceFactory::CreateProxyService(
     net::NetLog* net_log,
     net::URLRequestContext* context,
     net::NetworkDelegate* network_delegate,
-    net::ProxyConfigService* proxy_config_service,
+    scoped_ptr<net::ProxyConfigService> proxy_config_service,
     const base::CommandLine& command_line,
     bool quick_check_enabled) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
 #if defined(OS_IOS)
   bool use_v8 = false;
 #else
   bool use_v8 = !command_line.HasSwitch(switches::kWinHttpProxyResolver);
   // TODO(eroman): Figure out why this doesn't work in single-process mode.
   // Should be possible now that a private isolate is used.
   // http://crbug.com/474654
@@ skipping 31 matching lines @@
 #else
     net::DhcpProxyScriptFetcherFactory dhcp_factory;
     dhcp_proxy_script_fetcher = dhcp_factory.Create(context);
 #endif
 
 #if !defined(OS_ANDROID)
     // In-process Mojo PAC can only be set on the command line, so its presence
     // should override other options.
     if (command_line.HasSwitch(switches::kV8PacMojoInProcess)) {
       proxy_service = net::CreateProxyServiceUsingMojoInProcess(
-          proxy_config_service, new net::ProxyScriptFetcherImpl(context),
+          proxy_config_service.Pass(), new net::ProxyScriptFetcherImpl(context),
           dhcp_proxy_script_fetcher.Pass(), context->host_resolver(), net_log,
           network_delegate);
     } else if (EnableOutOfProcessV8Pac(command_line)) {
       proxy_service = net::CreateProxyServiceUsingMojoFactory(
           UtilityProcessMojoProxyResolverFactory::GetInstance(),
-          proxy_config_service, new net::ProxyScriptFetcherImpl(context),
+          proxy_config_service.Pass(), new net::ProxyScriptFetcherImpl(context),
           dhcp_proxy_script_fetcher.Pass(), context->host_resolver(), net_log,
           network_delegate);
     }
 #endif  // !defined(OS_ANDROID)
 
     if (!proxy_service) {
       proxy_service = net::CreateProxyServiceUsingV8ProxyResolver(
-          proxy_config_service, new net::ProxyScriptFetcherImpl(context),
+          proxy_config_service.Pass(), new net::ProxyScriptFetcherImpl(context),
           dhcp_proxy_script_fetcher.Pass(), context->host_resolver(), net_log,
           network_delegate);
     }
 #endif  // defined(OS_IOS)
   } else {
     proxy_service = net::ProxyService::CreateUsingSystemProxyResolver(
-        proxy_config_service,
-        num_pac_threads,
-        net_log);
+        proxy_config_service.Pass(), num_pac_threads, net_log);
   }
 
   proxy_service->set_quick_check_enabled(quick_check_enabled);
 
   return proxy_service;
 }