Remove base::StringValue

components/policy/core/common/registry_dict_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.h"
 
 #include <string>
 #include <utility>
 
 #include "base/memory/ptr_util.h"
 #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::Value int_value(42);
-  base::StringValue string_value("fortytwo");
+  base::Value string_value("fortytwo");
 
   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")));
   EXPECT_FALSE(test_dict.GetValue("two"));
 
   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")));
 
   std::unique_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::Value int_value(42);
-  base::StringValue string_value("fortytwo");
+  base::Value string_value("fortytwo");
 
   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", string_value.CreateDeepCopy());
   EXPECT_EQ(1u, test_dict.values().size());
   EXPECT_TRUE(base::Value::Equals(&string_value, test_dict.GetValue("one")));
 
   std::unique_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::Value int_value(42);
-  base::StringValue string_value("fortytwo");
+  base::Value string_value("fortytwo");
 
   std::unique_ptr<RegistryDict> subdict(new RegistryDict());
   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());
@@ skipping 43 matching lines @@
   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::Value int_value(42);
-  base::StringValue string_value("fortytwo");
+  base::Value string_value("fortytwo");
 
   dict_a.SetValue("one", int_value.CreateDeepCopy());
   std::unique_ptr<RegistryDict> subdict(new RegistryDict());
   subdict->SetValue("two", string_value.CreateDeepCopy());
   dict_a.SetKey("three", std::move(subdict));
 
   dict_b.SetValue("four", string_value.CreateDeepCopy());
   subdict.reset(new RegistryDict());
   subdict->SetValue("two", int_value.CreateDeepCopy());
   dict_b.SetKey("three", std::move(subdict));
@@ skipping 12 matching lines @@
   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::Value int_value(42);
-  base::StringValue string_value("fortytwo");
+  base::Value string_value("fortytwo");
 
   dict_a.SetValue("one", int_value.CreateDeepCopy());
   dict_a.SetKey("two", base::MakeUnique<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"));
 }
 
 #if defined(OS_WIN)
 TEST(RegistryDictTest, ConvertToJSON) {
   RegistryDict test_dict;
 
   base::Value int_value(42);
-  base::StringValue string_value("fortytwo");
-  base::StringValue string_zero("0");
-  base::StringValue string_dict("{ \"key\": [ \"value\" ] }");
+  base::Value string_value("fortytwo");
+  base::Value string_zero("0");
+  base::Value string_dict("{ \"key\": [ \"value\" ] }");
 
   test_dict.SetValue("one", int_value.CreateDeepCopy());
   std::unique_ptr<RegistryDict> subdict(new RegistryDict());
   subdict->SetValue("two", string_value.CreateDeepCopy());
   test_dict.SetKey("three", std::move(subdict));
   std::unique_ptr<RegistryDict> list(new RegistryDict());
   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());
@@ skipping 32 matching lines @@
   expected.Set("three", std::move(expected_subdict));
   std::unique_ptr<base::ListValue> expected_list(new base::ListValue());
   expected_list->Append(string_value.CreateDeepCopy());
   expected.Set("dict-to-list", std::move(expected_list));
   expected.Set("int-to-bool", new base::Value(true));
   expected.Set("int-to-double", new base::Value(42.0));
   expected.Set("string-to-bool", new base::Value(false));
   expected.Set("string-to-double", new base::Value(0.0));
   expected.Set("string-to-int", new base::Value(static_cast<int>(0)));
   expected_list.reset(new base::ListValue());
-  expected_list->Append(base::MakeUnique<base::StringValue>("value"));
+  expected_list->Append(base::MakeUnique<base::Value>("value"));
   expected_subdict.reset(new base::DictionaryValue());
   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, NonSequentialConvertToJSON) {
   RegistryDict test_dict;
 
   std::unique_ptr<RegistryDict> list(new RegistryDict());
-  list->SetValue("1", base::StringValue("1").CreateDeepCopy());
-  list->SetValue("2", base::StringValue("2").CreateDeepCopy());
-  list->SetValue("THREE", base::StringValue("3").CreateDeepCopy());
-  list->SetValue("4", base::StringValue("4").CreateDeepCopy());
+  list->SetValue("1", base::Value("1").CreateDeepCopy());
+  list->SetValue("2", base::Value("2").CreateDeepCopy());
+  list->SetValue("THREE", base::Value("3").CreateDeepCopy());
+  list->SetValue("4", base::Value("4").CreateDeepCopy());
   test_dict.SetKey("dict-to-list", std::move(list));
 
   std::string error;
   Schema schema = Schema::Parse(
       "{"
       "  \"type\": \"object\","
       "  \"properties\": {"
       "    \"dict-to-list\": {"
       "      \"type\": \"array\","
       "      \"items\": { \"type\": \"string\" }"
       "    }"
       "  }"
       "}",
       &error);
   ASSERT_TRUE(schema.valid()) << error;
 
   std::unique_ptr<base::Value> actual(test_dict.ConvertToJSON(schema));
 
   base::DictionaryValue expected;
   std::unique_ptr<base::ListValue> expected_list(new base::ListValue());
-  expected_list->Append(base::StringValue("1").CreateDeepCopy());
-  expected_list->Append(base::StringValue("2").CreateDeepCopy());
-  expected_list->Append(base::StringValue("4").CreateDeepCopy());
+  expected_list->Append(base::Value("1").CreateDeepCopy());
+  expected_list->Append(base::Value("2").CreateDeepCopy());
+  expected_list->Append(base::Value("4").CreateDeepCopy());
   expected.Set("dict-to-list", std::move(expected_list));
 
   EXPECT_TRUE(base::Value::Equals(actual.get(), &expected));
 }
 #endif
 
 TEST(RegistryDictTest, KeyValueNameClashes) {
   RegistryDict test_dict;
 
   base::Value int_value(42);
-  base::StringValue string_value("fortytwo");
+  base::Value string_value("fortytwo");
 
   test_dict.SetValue("one", int_value.CreateDeepCopy());
   std::unique_ptr<RegistryDict> subdict(new RegistryDict());
   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