Use unique_ptr<DictionaryValue> in ProxyConfigDictionary

components/policy/core/browser/proxy_policy_handler.cc

 // Copyright 2013 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 "components/policy/core/browser/proxy_policy_handler.h"
 
 #include <stddef.h>
 
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"

[bartfab (slow), 2017/03/31 11:34:14]

Nit: No longer used.

[vabr (Chromium), 2017/04/04 15:32:15]

Good point, thanks!
I did it as a follow-up in https://codereview.chromium.org/2793093003. Sorry for
the delay, I was sick recently.

 #include "base/strings/string_number_conversions.h"
 #include "base/values.h"
 #include "components/policy/core/browser/configuration_policy_handler.h"
 #include "components/policy/core/browser/policy_error_map.h"
 #include "components/policy/core/common/policy_map.h"
 #include "components/policy/policy_constants.h"
 #include "components/prefs/pref_value_map.h"
 #include "components/proxy_config/proxy_config_dictionary.h"
 #include "components/proxy_config/proxy_config_pref_names.h"
 #include "components/strings/grit/components_strings.h"
@@ skipping 146 matching lines @@
         proxy_mode = ProxyPrefs::MODE_DIRECT;
         NOTREACHED();
     }
   } else {
     return;
   }
 
   switch (proxy_mode) {
     case ProxyPrefs::MODE_DIRECT:
       prefs->SetValue(proxy_config::prefs::kProxy,
-                      base::WrapUnique(ProxyConfigDictionary::CreateDirect()));
+                      ProxyConfigDictionary::CreateDirect());
       break;
     case ProxyPrefs::MODE_AUTO_DETECT:
-      prefs->SetValue(
-          proxy_config::prefs::kProxy,
-          base::WrapUnique(ProxyConfigDictionary::CreateAutoDetect()));
+      prefs->SetValue(proxy_config::prefs::kProxy,
+                      ProxyConfigDictionary::CreateAutoDetect());
       break;
     case ProxyPrefs::MODE_PAC_SCRIPT: {
       std::string pac_url_string;
       if (pac_url && pac_url->GetAsString(&pac_url_string)) {
-        prefs->SetValue(proxy_config::prefs::kProxy,
-                        base::WrapUnique(ProxyConfigDictionary::CreatePacScript(
-                            pac_url_string, false)));
+        prefs->SetValue(
+            proxy_config::prefs::kProxy,
+            ProxyConfigDictionary::CreatePacScript(pac_url_string, false));
       } else {
         NOTREACHED();
       }
       break;
     }
     case ProxyPrefs::MODE_FIXED_SERVERS: {
       std::string proxy_server;
       std::string bypass_list_string;
       if (server->GetAsString(&proxy_server)) {
         if (bypass_list)
           bypass_list->GetAsString(&bypass_list_string);
-        prefs->SetValue(
-            proxy_config::prefs::kProxy,
-            base::WrapUnique(ProxyConfigDictionary::CreateFixedServers(
-                proxy_server, bypass_list_string)));
+        prefs->SetValue(proxy_config::prefs::kProxy,
+                        ProxyConfigDictionary::CreateFixedServers(
+                            proxy_server, bypass_list_string));
       }
       break;
     }
     case ProxyPrefs::MODE_SYSTEM:
       prefs->SetValue(proxy_config::prefs::kProxy,
-                      base::WrapUnique(ProxyConfigDictionary::CreateSystem()));
+                      ProxyConfigDictionary::CreateSystem());
       break;
     case ProxyPrefs::kModeCount:
       NOTREACHED();
   }
 }
 
 const base::Value* ProxyPolicyHandler::GetProxyPolicyValue(
     const PolicyMap& policies, const char* policy_name) {
   // See note on the ProxyPolicyHandler implementation above.
   const base::Value* value = policies.GetValue(key::kProxySettings);
@@ skipping 106 matching lines @@
                          key::kProxyServerMode,
                          IDS_POLICY_OUT_OF_RANGE_ERROR,
                          base::IntToString(server_mode_value));
         return false;
     }
   }
   return true;
 }
 
 }  // namespace policy