Convert Pass()→std::move() on Windows

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 <utility>
 
 #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", scoped_ptr<base::Value>(int_value.DeepCopy()));
+  test_dict.SetValue("one", int_value.CreateDeepCopy());

[dcheng, 2016/03/02 01:59:58]

Strictly speaking, not directly related, but since I was fixing Pass() here
already, I switched away from some of the other deprecated base::Value apis.

   EXPECT_EQ(1u, 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", scoped_ptr<base::Value>(string_value.DeepCopy()));
+  test_dict.SetValue("two", string_value.CreateDeepCopy());
   EXPECT_EQ(2u, 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(1u, 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", scoped_ptr<base::Value>(int_value.DeepCopy()));
+  test_dict.SetValue("One", int_value.CreateDeepCopy());
   EXPECT_EQ(1u, 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", scoped_ptr<base::Value>(string_value.DeepCopy()));
+  test_dict.SetValue("ONE", string_value.CreateDeepCopy());
   EXPECT_EQ(1u, 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", scoped_ptr<base::Value>(int_value.DeepCopy()));
-  test_dict.SetKey("two", subdict.Pass());
+  subdict->SetValue("one", int_value.CreateDeepCopy());
+  test_dict.SetKey("two", std::move(subdict));
   EXPECT_EQ(1u, 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", scoped_ptr<base::Value>(string_value.DeepCopy()));
-  test_dict.SetKey("four", subdict.Pass());
+  subdict->SetValue("three", string_value.CreateDeepCopy());
+  test_dict.SetKey("four", std::move(subdict));
   EXPECT_EQ(2u, 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")));
 
   test_dict.ClearKeys();
   EXPECT_FALSE(test_dict.GetKey("one"));
   EXPECT_FALSE(test_dict.GetKey("three"));
   EXPECT_TRUE(test_dict.keys().empty());
 }
 
 TEST(RegistryDictTest, CaseInsensitiveButPreservingKeyNames) {
   RegistryDict test_dict;
 
   base::FundamentalValue int_value(42);
 
-  test_dict.SetKey("One", make_scoped_ptr(new RegistryDict()).Pass());
+  test_dict.SetKey("One", make_scoped_ptr(new RegistryDict()));
   EXPECT_EQ(1u, 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", scoped_ptr<base::Value>(int_value.DeepCopy()));
-  test_dict.SetKey("ONE", subdict.Pass());
+  subdict->SetValue("two", int_value.CreateDeepCopy());
+  test_dict.SetKey("ONE", std::move(subdict));
   EXPECT_EQ(1u, 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", scoped_ptr<base::Value>(int_value.DeepCopy()));
+  dict_a.SetValue("one", int_value.CreateDeepCopy());
   scoped_ptr<RegistryDict> subdict(new RegistryDict());
-  subdict->SetValue("two", scoped_ptr<base::Value>(string_value.DeepCopy()));
-  dict_a.SetKey("three", subdict.Pass());
+  subdict->SetValue("two", string_value.CreateDeepCopy());
+  dict_a.SetKey("three", std::move(subdict));
 
-  dict_b.SetValue("four", scoped_ptr<base::Value>(string_value.DeepCopy()));
+  dict_b.SetValue("four", string_value.CreateDeepCopy());
   subdict.reset(new RegistryDict());
-  subdict->SetValue("two", scoped_ptr<base::Value>(int_value.DeepCopy()));
-  dict_b.SetKey("three", subdict.Pass());
+  subdict->SetValue("two", int_value.CreateDeepCopy());
+  dict_b.SetKey("three", std::move(subdict));
   subdict.reset(new RegistryDict());
-  subdict->SetValue("five", scoped_ptr<base::Value>(int_value.DeepCopy()));
-  dict_b.SetKey("six", subdict.Pass());
+  subdict->SetValue("five", int_value.CreateDeepCopy());
+  dict_b.SetKey("six", std::move(subdict));
 
   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", scoped_ptr<base::Value>(int_value.DeepCopy()));
-  dict_a.SetKey("two", make_scoped_ptr(new RegistryDict()).Pass());
-  dict_b.SetValue("three", scoped_ptr<base::Value>(string_value.DeepCopy()));
+  dict_a.SetValue("one", int_value.CreateDeepCopy());
+  dict_a.SetKey("two", make_scoped_ptr(new RegistryDict()));
+  dict_b.SetValue("three", string_value.CreateDeepCopy());
 
   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", scoped_ptr<base::Value>(int_value.DeepCopy()));
+  test_dict.SetValue("one", int_value.CreateDeepCopy());
   scoped_ptr<RegistryDict> subdict(new RegistryDict());
-  subdict->SetValue("two", scoped_ptr<base::Value>(string_value.DeepCopy()));
-  test_dict.SetKey("three", subdict.Pass());
+  subdict->SetValue("two", string_value.CreateDeepCopy());
+  test_dict.SetKey("three", std::move(subdict));
   scoped_ptr<RegistryDict> list(new RegistryDict());
-  list->SetValue("1", scoped_ptr<base::Value>(string_value.DeepCopy()));
-  test_dict.SetKey("dict-to-list", list.Pass());
-  test_dict.SetValue("int-to-bool",
-                     scoped_ptr<base::Value>(int_value.DeepCopy()));
-  test_dict.SetValue("int-to-double",
-                     scoped_ptr<base::Value>(int_value.DeepCopy()));
-  test_dict.SetValue("string-to-bool",
-                     scoped_ptr<base::Value>(string_zero.DeepCopy()));
-  test_dict.SetValue("string-to-double",
-                     scoped_ptr<base::Value>(string_zero.DeepCopy()));
-  test_dict.SetValue("string-to-int",
-                     scoped_ptr<base::Value>(string_zero.DeepCopy()));
-  test_dict.SetValue("string-to-dict",
-                     scoped_ptr<base::Value>(string_dict.DeepCopy()));
+  list->SetValue("1", string_value.CreateDeepCopy());
+  test_dict.SetKey("dict-to-list", std::move(list));
+  test_dict.SetValue("int-to-bool", int_value.CreateDeepCopy());
+  test_dict.SetValue("int-to-double", int_value.CreateDeepCopy());
+  test_dict.SetValue("string-to-bool", string_zero.CreateDeepCopy());
+  test_dict.SetValue("string-to-double", string_zero.CreateDeepCopy());
+  test_dict.SetValue("string-to-int", string_zero.CreateDeepCopy());
+  test_dict.SetValue("string-to-dict", string_dict.CreateDeepCopy());
 
   std::string error;
   Schema schema = Schema::Parse(
       "{"
       "  \"type\": \"object\","
       "  \"properties\": {"
       "    \"dict-to-list\": {"
       "      \"type\": \"array\","
       "      \"items\": { \"type\": \"string\" }"
       "    },"
       "    \"int-to-bool\": { \"type\": \"boolean\" },"
       "    \"int-to-double\": { \"type\": \"number\" },"
       "    \"string-to-bool\": { \"type\": \"boolean\" },"
       "    \"string-to-double\": { \"type\": \"number\" },"
       "    \"string-to-int\": { \"type\": \"integer\" },"
       "    \"string-to-dict\": { \"type\": \"object\" }"
       "  }"
       "}", &error);
   ASSERT_TRUE(schema.valid()) << error;
 
   scoped_ptr<base::Value> actual(test_dict.ConvertToJSON(schema));
 
   base::DictionaryValue expected;
-  expected.Set("one", int_value.DeepCopy());
+  expected.Set("one", int_value.CreateDeepCopy());
   scoped_ptr<base::DictionaryValue> expected_subdict(
       new base::DictionaryValue());
-  expected_subdict->Set("two", string_value.DeepCopy());
-  expected.Set("three", expected_subdict.release());
+  expected_subdict->Set("two", string_value.CreateDeepCopy());
+  expected.Set("three", std::move(expected_subdict));
   scoped_ptr<base::ListValue> expected_list(new base::ListValue());
-  expected_list->Append(string_value.DeepCopy());
-  expected.Set("dict-to-list", expected_list.release());
+  expected_list->Append(string_value.CreateDeepCopy());
+  expected.Set("dict-to-list", std::move(expected_list));
   expected.Set("int-to-bool", new base::FundamentalValue(true));
   expected.Set("int-to-double", new base::FundamentalValue(42.0));
   expected.Set("string-to-bool", new base::FundamentalValue(false));
   expected.Set("string-to-double", new base::FundamentalValue(0.0));
   expected.Set("string-to-int",
                new base::FundamentalValue(static_cast<int>(0)));
   expected_list.reset(new base::ListValue());
   expected_list->Append(new base::StringValue("value"));
   expected_subdict.reset(new base::DictionaryValue());
-  expected_subdict->Set("key", expected_list.release());
-  expected.Set("string-to-dict", expected_subdict.release());
+  expected_subdict->Set("key", std::move(expected_list));
+  expected.Set("string-to-dict", std::move(expected_subdict));
 
   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", scoped_ptr<base::Value>(int_value.DeepCopy()));
+  test_dict.SetValue("one", int_value.CreateDeepCopy());
   scoped_ptr<RegistryDict> subdict(new RegistryDict());
-  subdict->SetValue("two", scoped_ptr<base::Value>(string_value.DeepCopy()));
-  test_dict.SetKey("one", subdict.Pass());
+  subdict->SetValue("two", string_value.CreateDeepCopy());
+  test_dict.SetKey("one", std::move(subdict));
 
   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