Use std::unique_ptr to express ownership of base::Value in PolicyMap::Entry

chrome/browser/prefs/proxy_policy_unittest.cc

Index: chrome/browser/prefs/proxy_policy_unittest.cc
diff --git a/chrome/browser/prefs/proxy_policy_unittest.cc b/chrome/browser/prefs/proxy_policy_unittest.cc
index 367d2e83cca6eb43c094647b115db98f8ffe1196..57d34ead3c0108bde43a90ff9bb009159320f407 100644
--- a/chrome/browser/prefs/proxy_policy_unittest.cc
+++ b/chrome/browser/prefs/proxy_policy_unittest.cc
@@ -2,11 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <memory>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/command_line.h"
+#include "base/memory/ptr_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/message_loop/message_loop.h"
 #include "chrome/browser/browser_process.h"
@@ -125,23 +127,17 @@ class ProxyPolicyTest : public testing::Test {
 TEST_F(ProxyPolicyTest, OverridesCommandLineOptions) {
   command_line_.AppendSwitchASCII(switches::kProxyBypassList, "123");
   command_line_.AppendSwitchASCII(switches::kProxyServer, "789");
-  base::Value* mode_name =
-      new base::StringValue(ProxyPrefs::kFixedServersProxyModeName);
+  std::unique_ptr<base::Value> mode_name(
+      new base::StringValue(ProxyPrefs::kFixedServersProxyModeName));
   PolicyMap policy;
   policy.Set(key::kProxyMode, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
-             POLICY_SOURCE_CLOUD, mode_name, nullptr);
-  policy.Set(key::kProxyBypassList,
-             POLICY_LEVEL_MANDATORY,
-             POLICY_SCOPE_USER,
+             POLICY_SOURCE_CLOUD, std::move(mode_name), nullptr);
+  policy.Set(key::kProxyBypassList, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
              POLICY_SOURCE_CLOUD,
-             new base::StringValue("abc"),
-             NULL);
-  policy.Set(key::kProxyServer,
-             POLICY_LEVEL_MANDATORY,
-             POLICY_SCOPE_USER,
+             base::WrapUnique(new base::StringValue("abc")), nullptr);
+  policy.Set(key::kProxyServer, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
              POLICY_SOURCE_CLOUD,
-             new base::StringValue("ghi"),
-             NULL);
+             base::WrapUnique(new base::StringValue("ghi")), nullptr);
   provider_.UpdateChromePolicy(policy);
 
   // First verify that command-line options are set correctly when
@@ -168,11 +164,11 @@ TEST_F(ProxyPolicyTest, OverridesCommandLineOptions) {
 TEST_F(ProxyPolicyTest, OverridesUnrelatedCommandLineOptions) {
   command_line_.AppendSwitchASCII(switches::kProxyBypassList, "123");
   command_line_.AppendSwitchASCII(switches::kProxyServer, "789");
-  base::Value* mode_name =
-      new base::StringValue(ProxyPrefs::kAutoDetectProxyModeName);
+  std::unique_ptr<base::Value> mode_name(
+      new base::StringValue(ProxyPrefs::kAutoDetectProxyModeName));
   PolicyMap policy;
   policy.Set(key::kProxyMode, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
-             POLICY_SOURCE_CLOUD, mode_name, nullptr);
+             POLICY_SOURCE_CLOUD, std::move(mode_name), nullptr);
   provider_.UpdateChromePolicy(policy);
 
   // First verify that command-line options are set correctly when
@@ -196,11 +192,11 @@ TEST_F(ProxyPolicyTest, OverridesUnrelatedCommandLineOptions) {
 
 TEST_F(ProxyPolicyTest, OverridesCommandLineNoProxy) {
   command_line_.AppendSwitch(switches::kNoProxyServer);
-  base::Value* mode_name =
-      new base::StringValue(ProxyPrefs::kAutoDetectProxyModeName);
+  std::unique_ptr<base::Value> mode_name(
+      new base::StringValue(ProxyPrefs::kAutoDetectProxyModeName));
   PolicyMap policy;
   policy.Set(key::kProxyMode, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
-             POLICY_SOURCE_CLOUD, mode_name, nullptr);
+             POLICY_SOURCE_CLOUD, std::move(mode_name), nullptr);
   provider_.UpdateChromePolicy(policy);
 
   // First verify that command-line options are set correctly when
@@ -220,11 +216,11 @@ TEST_F(ProxyPolicyTest, OverridesCommandLineNoProxy) {
 
 TEST_F(ProxyPolicyTest, OverridesCommandLineAutoDetect) {
   command_line_.AppendSwitch(switches::kProxyAutoDetect);
-  base::Value* mode_name =
-      new base::StringValue(ProxyPrefs::kDirectProxyModeName);
+  std::unique_ptr<base::Value> mode_name(
+      new base::StringValue(ProxyPrefs::kDirectProxyModeName));
   PolicyMap policy;
   policy.Set(key::kProxyMode, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
-             POLICY_SOURCE_CLOUD, mode_name, nullptr);
+             POLICY_SOURCE_CLOUD, std::move(mode_name), nullptr);
   provider_.UpdateChromePolicy(policy);
 
   // First verify that the auto-detect is set if there is no managed