Remove base::StringValue

tools/json_schema_compiler/test/choices_unittest.cc

 // Copyright (c) 2012 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 "tools/json_schema_compiler/test/choices.h"
 
 #include <stddef.h>
 
 #include <utility>
 
@@ skipping 28 matching lines @@
                   .release())));
     ASSERT_TRUE(params);
     ASSERT_TRUE(params->nums.as_integers);
     EXPECT_EQ(Vector(2, 6, 8), *params->nums.as_integers);
   }
 }
 
 TEST(JsonSchemaCompilerChoicesTest, ObjectWithChoicesParamsCreate) {
   {
     std::unique_ptr<ObjectWithChoices::Params> params(
-        ObjectWithChoices::Params::Create(*List(
-            Dictionary("strings", new base::StringValue("asdf")).release())));
+        ObjectWithChoices::Params::Create(
+            *List(Dictionary("strings", new base::Value("asdf")).release())));
     ASSERT_TRUE(params);
     EXPECT_FALSE(params->string_info.strings.as_strings);
     EXPECT_EQ("asdf", *params->string_info.strings.as_string);
     EXPECT_FALSE(params->string_info.integers);
   }
   {
     std::unique_ptr<ObjectWithChoices::Params> params(
         ObjectWithChoices::Params::Create(
-            *List(Dictionary("strings", new base::StringValue("asdf"),
-                             "integers", new base::Value(6))
+            *List(Dictionary("strings", new base::Value("asdf"), "integers",
+                             new base::Value(6))
                       .release())));
     ASSERT_TRUE(params);
     EXPECT_FALSE(params->string_info.strings.as_strings);
     EXPECT_EQ("asdf", *params->string_info.strings.as_string);
     ASSERT_TRUE(params->string_info.integers);
     EXPECT_FALSE(params->string_info.integers->as_integers);
     EXPECT_EQ(6, *params->string_info.integers->as_integer);
   }
 }
 
 // TODO(kalman): Clean up the rest of these tests to use the
 // Vector/List/Dictionary helpers.
 
 TEST(JsonSchemaCompilerChoicesTest, ObjectWithChoicesParamsCreateFail) {
   {
     std::unique_ptr<base::DictionaryValue> object_param(
         new base::DictionaryValue());
     object_param->SetWithoutPathExpansion("strings", new base::Value(5));
     std::unique_ptr<base::ListValue> params_value(new base::ListValue());
     params_value->Append(std::move(object_param));
     std::unique_ptr<ObjectWithChoices::Params> params(
         ObjectWithChoices::Params::Create(*params_value));
     EXPECT_FALSE(params.get());
   }
   {
     std::unique_ptr<base::DictionaryValue> object_param(
         new base::DictionaryValue());
-    object_param->SetWithoutPathExpansion("strings",
-                                          new base::StringValue("asdf"));
-    object_param->SetWithoutPathExpansion("integers",
-                                          new base::StringValue("asdf"));
+    object_param->SetWithoutPathExpansion("strings", new base::Value("asdf"));
+    object_param->SetWithoutPathExpansion("integers", new base::Value("asdf"));
     std::unique_ptr<base::ListValue> params_value(new base::ListValue());
     params_value->Append(std::move(object_param));
     std::unique_ptr<ObjectWithChoices::Params> params(
         ObjectWithChoices::Params::Create(*params_value));
     EXPECT_FALSE(params.get());
   }
   {
     std::unique_ptr<base::DictionaryValue> object_param(
         new base::DictionaryValue());
     object_param->SetWithoutPathExpansion("integers", new base::Value(6));
@@ skipping 186 matching lines @@
           obj->as_choice2->as_choice_types.get();
       // Bleh too much effort to test everything.
       ASSERT_EQ(2u, choice_types->size());
     }
 
     EXPECT_TRUE(base::Value::Equals(value.get(), obj->ToValue().get()));
   }
 }
 
 }  // namespace