Stop passing raw pointers to DictionaryValue::Set, part 2

chrome/browser/chromeos/proxy_cros_settings_parser.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/chromeos/proxy_cros_settings_parser.h"
 
 #include <stdint.h>
 
 #include "base/macros.h"
+#include "base/memory/ptr_util.h"
 #include "base/strings/string_util.h"
 #include "base/values.h"
 #include "chromeos/network/proxy/ui_proxy_config.h"
 #include "chromeos/network/proxy/ui_proxy_config_service.h"
 
 namespace chromeos {
 
 namespace {
 
-base::Value* CreateServerHostValue(const UIProxyConfig::ManualProxy& proxy) {
-  return proxy.server.is_valid()
-             ? new base::Value(proxy.server.host_port_pair().host())
-             : NULL;
+std::unique_ptr<base::Value> CreateServerHostValue(
+    const UIProxyConfig::ManualProxy& proxy) {
+  return proxy.server.is_valid() ? base::MakeUnique<base::Value>(
+                                       proxy.server.host_port_pair().host())
+                                 : nullptr;
 }
 
-base::Value* CreateServerPortValue(const UIProxyConfig::ManualProxy& proxy) {
-  return proxy.server.is_valid()
-             ? new base::Value(proxy.server.host_port_pair().port())
-             : NULL;
+std::unique_ptr<base::Value> CreateServerPortValue(
+    const UIProxyConfig::ManualProxy& proxy) {
+  return proxy.server.is_valid() ? base::MakeUnique<base::Value>(
+                                       proxy.server.host_port_pair().port())
+                                 : nullptr;
 }
 
 net::ProxyServer CreateProxyServer(std::string host,
                                    uint16_t port,
                                    net::ProxyServer::Scheme scheme) {
   if (host.empty() && port == 0)
     return net::ProxyServer();
   uint16_t default_port = net::ProxyServer::GetDefaultPortForScheme(scheme);
   net::HostPortPair host_port_pair;
   // Check if host is a valid URL or a string of valid format <server>::<port>.
@@ skipping 236 matching lines @@
     LOG(WARNING) << "Unknown proxy settings path " << path;
     return;
   }
 
   config_service->SetProxyConfig(network_guid, config);
 }
 
 bool GetProxyPrefValue(const std::string& network_guid,
                        const std::string& path,
                        UIProxyConfigService* config_service,
                        base::Value** out_value) {

[Daniel Erat, 2017/03/23 14:21:30]

nit: add a TODO to make this be a std::unique_ptr<base::Value>*?

[vabr (Chromium), 2017/03/23 22:43:50]

Good point!
Done.

   std::string controlled_by;
-  base::Value* data = NULL;
+  std::unique_ptr<base::Value> data;
   UIProxyConfig config;
   config_service->GetProxyConfig(network_guid, &config);
 
   if (path == kProxyPacUrl) {
     // Only show pacurl for pac-script mode.
     if (config.mode == UIProxyConfig::MODE_PAC_SCRIPT &&
         config.automatic_proxy.pac_url.is_valid()) {
-      data = new base::Value(config.automatic_proxy.pac_url.spec());
+      data =
+          base::MakeUnique<base::Value>(config.automatic_proxy.pac_url.spec());
     }
   } else if (path == kProxySingleHttp) {
     data = CreateServerHostValue(config.single_proxy);
   } else if (path == kProxySingleHttpPort) {
     data = CreateServerPortValue(config.single_proxy);
   } else if (path == kProxyHttpUrl) {
     data = CreateServerHostValue(config.http_proxy);
   } else if (path == kProxyHttpsUrl) {
     data = CreateServerHostValue(config.https_proxy);
   } else if (path == kProxyType) {
     if (config.mode == UIProxyConfig::MODE_AUTO_DETECT ||
         config.mode == UIProxyConfig::MODE_PAC_SCRIPT) {
-      data = new base::Value(3);
+      data = base::MakeUnique<base::Value>(3);
     } else if (config.mode == UIProxyConfig::MODE_SINGLE_PROXY ||
                config.mode == UIProxyConfig::MODE_PROXY_PER_SCHEME) {
-      data = new base::Value(2);
+      data = base::MakeUnique<base::Value>(2);
     } else {
-      data = new base::Value(1);
+      data = base::MakeUnique<base::Value>(1);
     }
     switch (config.state) {
       case ProxyPrefs::CONFIG_POLICY:
         controlled_by = "policy";
         break;
       case ProxyPrefs::CONFIG_EXTENSION:
         controlled_by = "extension";
         break;
       case ProxyPrefs::CONFIG_OTHER_PRECEDE:
         controlled_by = "other";
         break;
       default:
         if (!config.user_modifiable)
           controlled_by = "shared";
         break;
     }
   } else if (path == kProxySingle) {
-    data = new base::Value(config.mode == UIProxyConfig::MODE_SINGLE_PROXY);
+    data = base::MakeUnique<base::Value>(config.mode ==
+                                         UIProxyConfig::MODE_SINGLE_PROXY);
   } else if (path == kProxyUsePacUrl) {
-    data = new base::Value(config.mode == UIProxyConfig::MODE_PAC_SCRIPT);
+    data = base::MakeUnique<base::Value>(config.mode ==
+                                         UIProxyConfig::MODE_PAC_SCRIPT);
   } else if (path == kProxyFtpUrl) {
     data = CreateServerHostValue(config.ftp_proxy);
   } else if (path == kProxySocks) {
     data = CreateServerHostValue(config.socks_proxy);
   } else if (path == kProxyHttpPort) {
     data = CreateServerPortValue(config.http_proxy);
   } else if (path == kProxyHttpsPort) {
     data = CreateServerPortValue(config.https_proxy);
   } else if (path == kProxyFtpPort) {
     data = CreateServerPortValue(config.ftp_proxy);
   } else if (path == kProxySocksPort) {
     data = CreateServerPortValue(config.socks_proxy);
   } else if (path == kProxyIgnoreList) {
-    base::ListValue* list =  new base::ListValue();
+    auto list = base::MakeUnique<base::ListValue>();
     const auto& bypass_rules = config.bypass_rules.rules();
     for (const auto& rule : bypass_rules)
       list->AppendString(rule->ToString());
-    data = list;
+    data = std::move(list);
   } else {
     *out_value = NULL;
     return false;
   }
 
   // Decorate pref value as CoreOptionsHandler::CreateValueForPref() does.
   base::DictionaryValue* dict = new base::DictionaryValue;
   if (!data)
-    data = new base::Value("");
-  dict->Set("value", data);
+    data = base::MakeUnique<base::Value>(base::Value::Type::STRING);
+  dict->Set("value", std::move(data));
   if (path == kProxyType) {
     if (!controlled_by.empty())
       dict->SetString("controlledBy", controlled_by);
     dict->SetBoolean("disabled", !config.user_modifiable);
   } else {
     dict->SetBoolean("disabled", false);
   }
   *out_value = dict;
   return true;
 }
 
 }  // namespace proxy_cros_settings_parser
 
 }  // namespace chromeos