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

chrome/browser/net/proxy_service_factory.cc

Index: chrome/browser/net/proxy_service_factory.cc
diff --git a/chrome/browser/net/proxy_service_factory.cc b/chrome/browser/net/proxy_service_factory.cc
index 7ec1ac30ffbabacfe337518d51228ac58ea12092..06c7240718a9a890c88957f74a76f8ef799f54ec 100644
--- a/chrome/browser/net/proxy_service_factory.cc
+++ b/chrome/browser/net/proxy_service_factory.cc
@@ -152,10 +152,10 @@ net::ProxyService* ProxyServiceFactory::CreateProxyService(
 #if defined(OS_IOS)
     NOTREACHED();
 #else
-    net::DhcpProxyScriptFetcher* dhcp_proxy_script_fetcher;
+    scoped_ptr<net::DhcpProxyScriptFetcher> dhcp_proxy_script_fetcher = nullptr;

[eroman, 2015/08/19 22:08:39]

leave off "=nullptr".

(Default initialization sets to nullptr and code doesn't commonly specify it)

[Paritosh Kumar, 2015/08/20 15:23:34]

Done.

 #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);
@@ -167,13 +167,13 @@ net::ProxyService* ProxyServiceFactory::CreateProxyService(
     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)
@@ -181,7 +181,7 @@ net::ProxyService* ProxyServiceFactory::CreateProxyService(
     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)