Returning scoped_ptr<> instead of raw pointer in DhcpProxyScriptFetcherFactory::Create

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 134 matching lines @@
     } else {
       LOG(ERROR) << "Invalid switch for number of PAC threads: " << s;
     }
   }
 
   net::ProxyService* proxy_service = NULL;
   if (use_v8) {
 #if defined(OS_IOS)
     NOTREACHED();
 #else
-    net::DhcpProxyScriptFetcher* dhcp_proxy_script_fetcher;
+    scoped_ptr<net::DhcpProxyScriptFetcher> dhcp_proxy_script_fetcher;
 #if defined(OS_CHROMEOS)
-    dhcp_proxy_script_fetcher =
-        new chromeos::DhcpProxyScriptFetcherChromeos(context);
+    dhcp_proxy_script_fetcher.reset(
+        new chromeos::DhcpProxyScriptFetcherChromeos(context));
 #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),
-          dhcp_proxy_script_fetcher, context->host_resolver(), net_log,
+          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),
-          dhcp_proxy_script_fetcher, context->host_resolver(), net_log,
+          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),
-          dhcp_proxy_script_fetcher, context->host_resolver(), net_log,
+          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_service->set_quick_check_enabled(quick_check_enabled);
 
   return proxy_service;
 }