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

chrome/browser/policy/managed_bookmarks_policy_handler_unittest.cc

 // Copyright 2014 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/policy/managed_bookmarks_policy_handler.h"
 
 #include <utility>
 
 #include "base/json/json_reader.h"
 #include "base/memory/ptr_util.h"
@@ skipping 18 matching lines @@
     handler_list_.AddHandler(base::WrapUnique<ConfigurationPolicyHandler>(
         new ManagedBookmarksPolicyHandler(chrome_schema)));
   }
 };
 
 #if defined(ENABLE_EXTENSIONS)
 TEST_F(ManagedBookmarksPolicyHandlerTest, ApplyPolicySettings) {
   EXPECT_FALSE(store_->GetValue(bookmarks::prefs::kManagedBookmarks, NULL));
 
   PolicyMap policy;
-  policy.Set(key::kManagedBookmarks,
-             POLICY_LEVEL_MANDATORY,
-             POLICY_SCOPE_USER,
+  policy.Set(key::kManagedBookmarks, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
              POLICY_SOURCE_CLOUD,
              base::JSONReader::Read("["
                                     // The following gets filtered out from the
                                     // JSON string when parsed.
                                     "  {"
                                     "    \"toplevel_name\": \"abc 123\""
                                     "  },"
                                     "  {"
                                     "    \"name\": \"Google\","
                                     "    \"url\": \"google.com\""
@@ skipping 17 matching lines @@
                                     "        \"name\": \"More Stuff\","
                                     "        \"children\": ["
                                     "          {"
                                     "            \"name\": \"Bugs\","
                                     "            \"url\": \"crbug.com\""
                                     "          }"
                                     "        ]"
                                     "      }"
                                     "    ]"
                                     "  }"
-                                    "]")
-                 .release(),
-             NULL);
+                                    "]"),
+             nullptr);
   UpdateProviderPolicy(policy);
   const base::Value* pref_value = NULL;
   EXPECT_TRUE(
       store_->GetValue(bookmarks::prefs::kManagedBookmarks, &pref_value));
   ASSERT_TRUE(pref_value);
 
   // Make sure the kManagedBookmarksFolderName pref is set correctly.
   const base::Value* folder_value = NULL;
   std::string folder_name;
   EXPECT_TRUE(store_->GetValue(bookmarks::prefs::kManagedBookmarksFolderName,
@@ skipping 46 matching lines @@
           .Build());
   EXPECT_TRUE(pref_value->Equals(expected.get()));
 }
 #endif  // defined(ENABLE_EXTENSIONS)
 
 #if defined(ENABLE_EXTENSIONS)
 TEST_F(ManagedBookmarksPolicyHandlerTest, ApplyPolicySettingsNoTitle) {
   EXPECT_FALSE(store_->GetValue(bookmarks::prefs::kManagedBookmarks, NULL));
 
   PolicyMap policy;
-  policy.Set(key::kManagedBookmarks,
-             POLICY_LEVEL_MANDATORY,
-             POLICY_SCOPE_USER,
+  policy.Set(key::kManagedBookmarks, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
              POLICY_SOURCE_CLOUD,
              base::JSONReader::Read("["
                                     "  {"
                                     "    \"name\": \"Google\","
                                     "    \"url\": \"google.com\""
                                     "  }"
-                                    "]")
-                 .release(),
-             NULL);
+                                    "]"),
+             nullptr);
   UpdateProviderPolicy(policy);
   const base::Value* pref_value = NULL;
   EXPECT_TRUE(
       store_->GetValue(bookmarks::prefs::kManagedBookmarks, &pref_value));
   ASSERT_TRUE(pref_value);
 
   // Make sure the kManagedBookmarksFolderName pref is set correctly.
   const base::Value* folder_value = NULL;
   std::string folder_name;
   EXPECT_TRUE(store_->GetValue(bookmarks::prefs::kManagedBookmarksFolderName,
@@ skipping 10 matching lines @@
                       .Build())
           .Build());
   EXPECT_TRUE(pref_value->Equals(expected.get()));
 }
 #endif  // defined(ENABLE_EXTENSIONS)
 
 TEST_F(ManagedBookmarksPolicyHandlerTest, WrongPolicyType) {
   PolicyMap policy;
   // The expected type is base::ListValue, but this policy sets it as an
   // unparsed base::StringValue. Any type other than ListValue should fail.
-  policy.Set(key::kManagedBookmarks,
-             POLICY_LEVEL_MANDATORY,
-             POLICY_SCOPE_USER,
-             POLICY_SOURCE_CLOUD,
-             new base::StringValue(
-                 "["
-                 "  {"
-                 "    \"name\": \"Google\","
-                 "    \"url\": \"google.com\""
-                 "  },"
-                 "]"),
-             NULL);
+  policy.Set(
+      key::kManagedBookmarks, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
+      POLICY_SOURCE_CLOUD,
+      base::WrapUnique(new base::StringValue("["
+                                             "  {"
+                                             "    \"name\": \"Google\","
+                                             "    \"url\": \"google.com\""
+                                             "  },"
+                                             "]")),
+      nullptr);
   UpdateProviderPolicy(policy);
   EXPECT_FALSE(store_->GetValue(bookmarks::prefs::kManagedBookmarks, NULL));
 }
 
 #if defined(ENABLE_EXTENSIONS)
 TEST_F(ManagedBookmarksPolicyHandlerTest, UnknownKeys) {
   PolicyMap policy;
-  policy.Set(key::kManagedBookmarks,
-             POLICY_LEVEL_MANDATORY,
-             POLICY_SCOPE_USER,
+  policy.Set(key::kManagedBookmarks, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
              POLICY_SOURCE_CLOUD,
              base::JSONReader::Read("["
                                     "  {"
                                     "    \"name\": \"Google\","
                                     "    \"unknown\": \"should be ignored\","
                                     "    \"url\": \"google.com\""
                                     "  }"
-                                    "]")
-                 .release(),
-             NULL);
+                                    "]"),
+             nullptr);
   UpdateProviderPolicy(policy);
   const base::Value* pref_value = NULL;
   EXPECT_TRUE(
       store_->GetValue(bookmarks::prefs::kManagedBookmarks, &pref_value));
   ASSERT_TRUE(pref_value);
 
   std::unique_ptr<base::Value> expected(
       extensions::ListBuilder()
           .Append(extensions::DictionaryBuilder()
                       .Set("name", "Google")
                       .Set("url", "http://google.com/")
                       .Build())
           .Build());
   EXPECT_TRUE(pref_value->Equals(expected.get()));
 }
 #endif
 
 #if defined(ENABLE_EXTENSIONS)
 TEST_F(ManagedBookmarksPolicyHandlerTest, BadBookmark) {
   PolicyMap policy;
-  policy.Set(key::kManagedBookmarks,
-             POLICY_LEVEL_MANDATORY,
-             POLICY_SCOPE_USER,
+  policy.Set(key::kManagedBookmarks, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
              POLICY_SOURCE_CLOUD,
              base::JSONReader::Read("["
                                     "  {"
                                     "    \"name\": \"Empty\","
                                     "    \"url\": \"\""
                                     "  },"
                                     "  {"
                                     "    \"name\": \"Invalid type\","
                                     "    \"url\": 4"
                                     "  },"
                                     "  {"
                                     "    \"name\": \"Invalid URL\","
                                     "    \"url\": \"?\""
                                     "  },"
                                     "  {"
                                     "    \"name\": \"Google\","
                                     "    \"url\": \"google.com\""
                                     "  }"
-                                    "]")
-                 .release(),
-             NULL);
+                                    "]"),
+             nullptr);
   UpdateProviderPolicy(policy);
   const base::Value* pref_value = NULL;
   EXPECT_TRUE(
       store_->GetValue(bookmarks::prefs::kManagedBookmarks, &pref_value));
   ASSERT_TRUE(pref_value);
 
   std::unique_ptr<base::Value> expected(
       extensions::ListBuilder()
           .Append(extensions::DictionaryBuilder()
                       .Set("name", "Google")
                       .Set("url", "http://google.com/")
                       .Build())
           .Build());
   EXPECT_TRUE(pref_value->Equals(expected.get()));
 }
 #endif
 
 }  // namespace policy