Pass() type followups after https://codereview.chromium.org/367403002/

components/policy/core/common/registry_dict_win_unittest.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/common/registry_dict_win.h"
 
 #include <string>
 
 #include "base/values.h"
 #include "components/policy/core/common/schema.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace policy {
 namespace {
 
 TEST(RegistryDictTest, SetAndGetValue) {
   RegistryDict test_dict;
 
   base::FundamentalValue int_value(42);
   base::StringValue string_value("fortytwo");
 
-  test_dict.SetValue("one", make_scoped_ptr(int_value.DeepCopy()).Pass());
+  test_dict.SetValue("one", scoped_ptr<base::Value>(int_value.DeepCopy()));
   EXPECT_EQ(1, test_dict.values().size());
   EXPECT_TRUE(base::Value::Equals(&int_value, test_dict.GetValue("one")));
   EXPECT_FALSE(test_dict.GetValue("two"));
 
-  test_dict.SetValue("two", make_scoped_ptr(string_value.DeepCopy()).Pass());
+  test_dict.SetValue("two", scoped_ptr<base::Value>(string_value.DeepCopy()));
   EXPECT_EQ(2, test_dict.values().size());
   EXPECT_TRUE(base::Value::Equals(&int_value, test_dict.GetValue("one")));
   EXPECT_TRUE(base::Value::Equals(&string_value, test_dict.GetValue("two")));
 
   scoped_ptr<base::Value> one(test_dict.RemoveValue("one"));
   EXPECT_EQ(1, test_dict.values().size());
   EXPECT_TRUE(base::Value::Equals(&int_value, one.get()));
   EXPECT_FALSE(test_dict.GetValue("one"));
   EXPECT_TRUE(base::Value::Equals(&string_value, test_dict.GetValue("two")));
 
   test_dict.ClearValues();
   EXPECT_FALSE(test_dict.GetValue("one"));
   EXPECT_FALSE(test_dict.GetValue("two"));
   EXPECT_TRUE(test_dict.values().empty());
 }
 
 TEST(RegistryDictTest, CaseInsensitiveButPreservingValueNames) {
   RegistryDict test_dict;
 
   base::FundamentalValue int_value(42);
   base::StringValue string_value("fortytwo");
 
-  test_dict.SetValue("One", make_scoped_ptr(int_value.DeepCopy()).Pass());
+  test_dict.SetValue("One", scoped_ptr<base::Value>(int_value.DeepCopy()));
   EXPECT_EQ(1, test_dict.values().size());
   EXPECT_TRUE(base::Value::Equals(&int_value, test_dict.GetValue("oNe")));
 
   RegistryDict::ValueMap::const_iterator entry = test_dict.values().begin();
   ASSERT_NE(entry, test_dict.values().end());
   EXPECT_EQ("One", entry->first);
 
-  test_dict.SetValue("ONE", make_scoped_ptr(string_value.DeepCopy()).Pass());
+  test_dict.SetValue("ONE", scoped_ptr<base::Value>(string_value.DeepCopy()));
   EXPECT_EQ(1, test_dict.values().size());
   EXPECT_TRUE(base::Value::Equals(&string_value, test_dict.GetValue("one")));
 
   scoped_ptr<base::Value> removed_value(test_dict.RemoveValue("onE"));
   EXPECT_TRUE(base::Value::Equals(&string_value, removed_value.get()));
   EXPECT_TRUE(test_dict.values().empty());
 }
 
 TEST(RegistryDictTest, SetAndGetKeys) {
   RegistryDict test_dict;
 
   base::FundamentalValue int_value(42);
   base::StringValue string_value("fortytwo");
 
   scoped_ptr<RegistryDict> subdict(new RegistryDict());
-  subdict->SetValue("one", make_scoped_ptr(int_value.DeepCopy()).Pass());
+  subdict->SetValue("one", scoped_ptr<base::Value>(int_value.DeepCopy()));
   test_dict.SetKey("two", subdict.Pass());
   EXPECT_EQ(1, test_dict.keys().size());
   RegistryDict* actual_subdict = test_dict.GetKey("two");
   ASSERT_TRUE(actual_subdict);
   EXPECT_TRUE(base::Value::Equals(&int_value, actual_subdict->GetValue("one")));
 
   subdict.reset(new RegistryDict());
-  subdict->SetValue("three", make_scoped_ptr(string_value.DeepCopy()).Pass());
+  subdict->SetValue("three", scoped_ptr<base::Value>(string_value.DeepCopy()));
   test_dict.SetKey("four", subdict.Pass());
   EXPECT_EQ(2, test_dict.keys().size());
   actual_subdict = test_dict.GetKey("two");
   ASSERT_TRUE(actual_subdict);
   EXPECT_TRUE(base::Value::Equals(&int_value, actual_subdict->GetValue("one")));
   actual_subdict = test_dict.GetKey("four");
   ASSERT_TRUE(actual_subdict);
   EXPECT_TRUE(base::Value::Equals(&string_value,
                                   actual_subdict->GetValue("three")));
 
@@ skipping 12 matching lines @@
   EXPECT_EQ(1, test_dict.keys().size());
   RegistryDict* actual_subdict = test_dict.GetKey("One");
   ASSERT_TRUE(actual_subdict);
   EXPECT_TRUE(actual_subdict->values().empty());
 
   RegistryDict::KeyMap::const_iterator entry = test_dict.keys().begin();
   ASSERT_NE(entry, test_dict.keys().end());
   EXPECT_EQ("One", entry->first);
 
   scoped_ptr<RegistryDict> subdict(new RegistryDict());
-  subdict->SetValue("two", make_scoped_ptr(int_value.DeepCopy()).Pass());
+  subdict->SetValue("two", scoped_ptr<base::Value>(int_value.DeepCopy()));
   test_dict.SetKey("ONE", subdict.Pass());
   EXPECT_EQ(1, test_dict.keys().size());
   actual_subdict = test_dict.GetKey("One");
   ASSERT_TRUE(actual_subdict);
   EXPECT_TRUE(base::Value::Equals(&int_value,
                                   actual_subdict->GetValue("two")));
 
   scoped_ptr<RegistryDict> removed_key(test_dict.RemoveKey("one"));
   ASSERT_TRUE(removed_key);
   EXPECT_TRUE(base::Value::Equals(&int_value,
                                   removed_key->GetValue("two")));
   EXPECT_TRUE(test_dict.keys().empty());
 }
 
 TEST(RegistryDictTest, Merge) {
   RegistryDict dict_a;
   RegistryDict dict_b;
 
   base::FundamentalValue int_value(42);
   base::StringValue string_value("fortytwo");
 
-  dict_a.SetValue("one", make_scoped_ptr(int_value.DeepCopy()).Pass());
+  dict_a.SetValue("one", scoped_ptr<base::Value>(int_value.DeepCopy()));
   scoped_ptr<RegistryDict> subdict(new RegistryDict());
-  subdict->SetValue("two", make_scoped_ptr(string_value.DeepCopy()).Pass());
+  subdict->SetValue("two", scoped_ptr<base::Value>(string_value.DeepCopy()));
   dict_a.SetKey("three", subdict.Pass());
 
-  dict_b.SetValue("four", make_scoped_ptr(string_value.DeepCopy()).Pass());
+  dict_b.SetValue("four", scoped_ptr<base::Value>(string_value.DeepCopy()));
   subdict.reset(new RegistryDict());
-  subdict->SetValue("two", make_scoped_ptr(int_value.DeepCopy()).Pass());
+  subdict->SetValue("two", scoped_ptr<base::Value>(int_value.DeepCopy()));
   dict_b.SetKey("three", subdict.Pass());
   subdict.reset(new RegistryDict());
-  subdict->SetValue("five", make_scoped_ptr(int_value.DeepCopy()).Pass());
+  subdict->SetValue("five", scoped_ptr<base::Value>(int_value.DeepCopy()));
   dict_b.SetKey("six", subdict.Pass());
 
   dict_a.Merge(dict_b);
 
   EXPECT_TRUE(base::Value::Equals(&int_value, dict_a.GetValue("one")));
   EXPECT_TRUE(base::Value::Equals(&string_value, dict_b.GetValue("four")));
   RegistryDict* actual_subdict = dict_a.GetKey("three");
   ASSERT_TRUE(actual_subdict);
   EXPECT_TRUE(base::Value::Equals(&int_value, actual_subdict->GetValue("two")));
   actual_subdict = dict_a.GetKey("six");
   ASSERT_TRUE(actual_subdict);
   EXPECT_TRUE(base::Value::Equals(&int_value,
                                   actual_subdict->GetValue("five")));
 }
 
 TEST(RegistryDictTest, Swap) {
   RegistryDict dict_a;
   RegistryDict dict_b;
 
   base::FundamentalValue int_value(42);
   base::StringValue string_value("fortytwo");
 
-  dict_a.SetValue("one", make_scoped_ptr(int_value.DeepCopy()).Pass());
+  dict_a.SetValue("one", scoped_ptr<base::Value>(int_value.DeepCopy()));
   dict_a.SetKey("two", make_scoped_ptr(new RegistryDict()).Pass());
-  dict_b.SetValue("three", make_scoped_ptr(string_value.DeepCopy()).Pass());
+  dict_b.SetValue("three", scoped_ptr<base::Value>(string_value.DeepCopy()));
 
   dict_a.Swap(&dict_b);
 
   EXPECT_TRUE(base::Value::Equals(&int_value, dict_b.GetValue("one")));
   EXPECT_TRUE(dict_b.GetKey("two"));
   EXPECT_FALSE(dict_b.GetValue("two"));
 
   EXPECT_TRUE(base::Value::Equals(&string_value, dict_a.GetValue("three")));
   EXPECT_FALSE(dict_a.GetValue("one"));
   EXPECT_FALSE(dict_a.GetKey("two"));
 }
 
 TEST(RegistryDictTest, ConvertToJSON) {
   RegistryDict test_dict;
 
   base::FundamentalValue int_value(42);
   base::StringValue string_value("fortytwo");
   base::StringValue string_zero("0");
   base::StringValue string_dict("{ \"key\": [ \"value\" ] }");
 
-  test_dict.SetValue("one", make_scoped_ptr(int_value.DeepCopy()).Pass());
+  test_dict.SetValue("one", scoped_ptr<base::Value>(int_value.DeepCopy()));
   scoped_ptr<RegistryDict> subdict(new RegistryDict());
-  subdict->SetValue("two", make_scoped_ptr(string_value.DeepCopy()).Pass());
+  subdict->SetValue("two", scoped_ptr<base::Value>(string_value.DeepCopy()));
   test_dict.SetKey("three", subdict.Pass());
   scoped_ptr<RegistryDict> list(new RegistryDict());
-  list->SetValue("1", make_scoped_ptr(string_value.DeepCopy()).Pass());
+  list->SetValue("1", scoped_ptr<base::Value>(string_value.DeepCopy()));
   test_dict.SetKey("dict-to-list", list.Pass());
   test_dict.SetValue("int-to-bool",
-                     make_scoped_ptr(int_value.DeepCopy()).Pass());
+                     scoped_ptr<base::Value>(int_value.DeepCopy()));
   test_dict.SetValue("int-to-double",
-                     make_scoped_ptr(int_value.DeepCopy()).Pass());
+                     scoped_ptr<base::Value>(int_value.DeepCopy()));
   test_dict.SetValue("string-to-bool",
-                     make_scoped_ptr(string_zero.DeepCopy()).Pass());
+                     scoped_ptr<base::Value>(string_zero.DeepCopy()));
   test_dict.SetValue("string-to-double",
-                     make_scoped_ptr(string_zero.DeepCopy()).Pass());
+                     scoped_ptr<base::Value>(string_zero.DeepCopy()));
   test_dict.SetValue("string-to-int",
-                     make_scoped_ptr(string_zero.DeepCopy()).Pass());
+                     scoped_ptr<base::Value>(string_zero.DeepCopy()));
   test_dict.SetValue("string-to-dict",
-                     make_scoped_ptr(string_dict.DeepCopy()).Pass());
+                     scoped_ptr<base::Value>(string_dict.DeepCopy()));
 
   std::string error;
   Schema schema = Schema::Parse(
       "{"
       "  \"type\": \"object\","
       "  \"properties\": {"
       "    \"dict-to-list\": {"
       "      \"type\": \"array\","
       "      \"items\": { \"type\": \"string\" }"
       "    },"
@@ skipping 31 matching lines @@
 
   EXPECT_TRUE(base::Value::Equals(actual.get(), &expected));
 }
 
 TEST(RegistryDictTest, KeyValueNameClashes) {
   RegistryDict test_dict;
 
   base::FundamentalValue int_value(42);
   base::StringValue string_value("fortytwo");
 
-  test_dict.SetValue("one", make_scoped_ptr(int_value.DeepCopy()).Pass());
+  test_dict.SetValue("one", scoped_ptr<base::Value>(int_value.DeepCopy()));
   scoped_ptr<RegistryDict> subdict(new RegistryDict());
-  subdict->SetValue("two", make_scoped_ptr(string_value.DeepCopy()).Pass());
+  subdict->SetValue("two", scoped_ptr<base::Value>(string_value.DeepCopy()));
   test_dict.SetKey("one", subdict.Pass());
 
   EXPECT_TRUE(base::Value::Equals(&int_value, test_dict.GetValue("one")));
   RegistryDict* actual_subdict = test_dict.GetKey("one");
   ASSERT_TRUE(actual_subdict);
   EXPECT_TRUE(base::Value::Equals(&string_value,
                                   actual_subdict->GetValue("two")));
 }
 
 }  // namespace
 }  // namespace policy