Use unique_ptr<DictionaryValue> in ProxyConfigDictionary

chrome/browser/prefs/chrome_command_line_pref_store.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/prefs/chrome_command_line_pref_store.h"
 
 #include <stddef.h>
 
 #include <string>
 #include <utility>
@@ skipping 105 matching lines @@
 void ChromeCommandLinePrefStore::ApplySimpleSwitches() {
   // Look for each switch we know about and set its preference accordingly.
   ApplyStringSwitches(string_switch_map_, arraysize(string_switch_map_));
   ApplyPathSwitches(path_switch_map_, arraysize(path_switch_map_));
   ApplyIntegerSwitches(integer_switch_map_, arraysize(integer_switch_map_));
   ApplyBooleanSwitches(boolean_switch_map_, arraysize(boolean_switch_map_));
 }
 
 void ChromeCommandLinePrefStore::ApplyProxyMode() {
   if (command_line()->HasSwitch(switches::kNoProxyServer)) {
-    SetValue(proxy_config::prefs::kProxy,
-             base::WrapUnique(ProxyConfigDictionary::CreateDirect()),
+    SetValue(proxy_config::prefs::kProxy, ProxyConfigDictionary::CreateDirect(),
              WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
   } else if (command_line()->HasSwitch(switches::kProxyPacUrl)) {
     std::string pac_script_url =
         command_line()->GetSwitchValueASCII(switches::kProxyPacUrl);
     SetValue(proxy_config::prefs::kProxy,
-             base::WrapUnique(
-                 ProxyConfigDictionary::CreatePacScript(pac_script_url, false)),
+             ProxyConfigDictionary::CreatePacScript(pac_script_url, false),
              WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
   } else if (command_line()->HasSwitch(switches::kProxyAutoDetect)) {
     SetValue(proxy_config::prefs::kProxy,
-             base::WrapUnique(ProxyConfigDictionary::CreateAutoDetect()),
+             ProxyConfigDictionary::CreateAutoDetect(),
              WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
   } else if (command_line()->HasSwitch(switches::kProxyServer)) {
     std::string proxy_server =
         command_line()->GetSwitchValueASCII(switches::kProxyServer);
     std::string bypass_list =
         command_line()->GetSwitchValueASCII(switches::kProxyBypassList);
-    SetValue(proxy_config::prefs::kProxy,
-             base::WrapUnique(ProxyConfigDictionary::CreateFixedServers(
-                 proxy_server, bypass_list)),
-             WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
+    SetValue(
+        proxy_config::prefs::kProxy,
+        ProxyConfigDictionary::CreateFixedServers(proxy_server, bypass_list),
+        WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
   }
 }
 
 void ChromeCommandLinePrefStore::ApplySSLSwitches() {
   if (command_line()->HasSwitch(switches::kCipherSuiteBlacklist)) {
     std::unique_ptr<base::ListValue> list_value(new base::ListValue());
     list_value->AppendStrings(base::SplitString(
         command_line()->GetSwitchValueASCII(switches::kCipherSuiteBlacklist),
         ",", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL));
     SetValue(ssl_config::prefs::kCipherSuiteBlacklist, std::move(list_value),
              WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
   }
 }
 
 void ChromeCommandLinePrefStore::ApplyBackgroundModeSwitches() {
   if (command_line()->HasSwitch(switches::kDisableExtensions)) {
     SetValue(prefs::kBackgroundModeEnabled,
              base::MakeUnique<base::Value>(false),
              WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
   }
 }