Convert //components/prefs from scoped_ptr to std::unique_ptr

components/prefs/pref_value_map_unittest.cc

Index: components/prefs/pref_value_map_unittest.cc
diff --git a/components/prefs/pref_value_map_unittest.cc b/components/prefs/pref_value_map_unittest.cc
index 04001a219eaa9507087ad19de8627c0109c779d7..087e239f0015c596c8c94094bed9f926829831dc 100644
--- a/components/prefs/pref_value_map_unittest.cc
+++ b/components/prefs/pref_value_map_unittest.cc
@@ -4,6 +4,7 @@
 
 #include "components/prefs/pref_value_map.h"
 
+#include "base/memory/ptr_util.h"
 #include "base/values.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -16,9 +17,10 @@ TEST(PrefValueMapTest, SetValue) {
   EXPECT_FALSE(map.GetValue("key", &result));
   EXPECT_FALSE(result);
 
-  EXPECT_TRUE(map.SetValue("key", make_scoped_ptr(new StringValue("test"))));
-  EXPECT_FALSE(map.SetValue("key", make_scoped_ptr(new StringValue("test"))));
-  EXPECT_TRUE(map.SetValue("key", make_scoped_ptr(new StringValue("hi mom!"))));
+  EXPECT_TRUE(map.SetValue("key", base::WrapUnique(new StringValue("test"))));
+  EXPECT_FALSE(map.SetValue("key", base::WrapUnique(new StringValue("test"))));
+  EXPECT_TRUE(
+      map.SetValue("key", base::WrapUnique(new StringValue("hi mom!"))));
 
   EXPECT_TRUE(map.GetValue("key", &result));
   EXPECT_TRUE(StringValue("hi mom!").Equals(result));
@@ -26,7 +28,7 @@ TEST(PrefValueMapTest, SetValue) {
 
 TEST(PrefValueMapTest, GetAndSetIntegerValue) {
   PrefValueMap map;
-  ASSERT_TRUE(map.SetValue("key", make_scoped_ptr(new FundamentalValue(5))));
+  ASSERT_TRUE(map.SetValue("key", base::WrapUnique(new FundamentalValue(5))));
 
   int int_value = 0;
   EXPECT_TRUE(map.GetInteger("key", &int_value));
@@ -39,7 +41,7 @@ TEST(PrefValueMapTest, GetAndSetIntegerValue) {
 
 TEST(PrefValueMapTest, SetDoubleValue) {
   PrefValueMap map;
-  ASSERT_TRUE(map.SetValue("key", make_scoped_ptr(new FundamentalValue(5.5))));
+  ASSERT_TRUE(map.SetValue("key", base::WrapUnique(new FundamentalValue(5.5))));
 
   const Value* result = NULL;
   ASSERT_TRUE(map.GetValue("key", &result));
@@ -52,7 +54,7 @@ TEST(PrefValueMapTest, RemoveValue) {
   PrefValueMap map;
   EXPECT_FALSE(map.RemoveValue("key"));
 
-  EXPECT_TRUE(map.SetValue("key", make_scoped_ptr(new StringValue("test"))));
+  EXPECT_TRUE(map.SetValue("key", base::WrapUnique(new StringValue("test"))));
   EXPECT_TRUE(map.GetValue("key", NULL));
 
   EXPECT_TRUE(map.RemoveValue("key"));
@@ -63,7 +65,7 @@ TEST(PrefValueMapTest, RemoveValue) {
 
 TEST(PrefValueMapTest, Clear) {
   PrefValueMap map;
-  EXPECT_TRUE(map.SetValue("key", make_scoped_ptr(new StringValue("test"))));
+  EXPECT_TRUE(map.SetValue("key", base::WrapUnique(new StringValue("test"))));
   EXPECT_TRUE(map.GetValue("key", NULL));
 
   map.Clear();
@@ -74,11 +76,11 @@ TEST(PrefValueMapTest, Clear) {
 TEST(PrefValueMapTest, GetDifferingKeys) {
   PrefValueMap reference;
   EXPECT_TRUE(
-      reference.SetValue("b", make_scoped_ptr(new StringValue("test"))));
+      reference.SetValue("b", base::WrapUnique(new StringValue("test"))));
   EXPECT_TRUE(
-      reference.SetValue("c", make_scoped_ptr(new StringValue("test"))));
+      reference.SetValue("c", base::WrapUnique(new StringValue("test"))));
   EXPECT_TRUE(
-      reference.SetValue("e", make_scoped_ptr(new StringValue("test"))));
+      reference.SetValue("e", base::WrapUnique(new StringValue("test"))));
 
   PrefValueMap check;
   std::vector<std::string> differing_paths;
@@ -90,9 +92,9 @@ TEST(PrefValueMapTest, GetDifferingKeys) {
   expected_differing_paths.push_back("e");
   EXPECT_EQ(expected_differing_paths, differing_paths);
 
-  EXPECT_TRUE(check.SetValue("a", make_scoped_ptr(new StringValue("test"))));
-  EXPECT_TRUE(check.SetValue("c", make_scoped_ptr(new StringValue("test"))));
-  EXPECT_TRUE(check.SetValue("d", make_scoped_ptr(new StringValue("test"))));
+  EXPECT_TRUE(check.SetValue("a", base::WrapUnique(new StringValue("test"))));
+  EXPECT_TRUE(check.SetValue("c", base::WrapUnique(new StringValue("test"))));
+  EXPECT_TRUE(check.SetValue("d", base::WrapUnique(new StringValue("test"))));
 
   reference.GetDifferingKeys(&check, &differing_paths);
   expected_differing_paths.clear();
@@ -106,19 +108,19 @@ TEST(PrefValueMapTest, GetDifferingKeys) {
 TEST(PrefValueMapTest, SwapTwoMaps) {
   PrefValueMap first_map;
   EXPECT_TRUE(
-      first_map.SetValue("a", make_scoped_ptr(new StringValue("test"))));
+      first_map.SetValue("a", base::WrapUnique(new StringValue("test"))));
   EXPECT_TRUE(
-      first_map.SetValue("b", make_scoped_ptr(new StringValue("test"))));
+      first_map.SetValue("b", base::WrapUnique(new StringValue("test"))));
   EXPECT_TRUE(
-      first_map.SetValue("c", make_scoped_ptr(new StringValue("test"))));
+      first_map.SetValue("c", base::WrapUnique(new StringValue("test"))));
 
   PrefValueMap second_map;
   EXPECT_TRUE(
-      second_map.SetValue("d", make_scoped_ptr(new StringValue("test"))));
+      second_map.SetValue("d", base::WrapUnique(new StringValue("test"))));
   EXPECT_TRUE(
-      second_map.SetValue("e", make_scoped_ptr(new StringValue("test"))));
+      second_map.SetValue("e", base::WrapUnique(new StringValue("test"))));
   EXPECT_TRUE(
-      second_map.SetValue("f", make_scoped_ptr(new StringValue("test"))));
+      second_map.SetValue("f", base::WrapUnique(new StringValue("test"))));
 
   first_map.Swap(&second_map);