| Index: tools/json_schema_compiler/test/error_generation_unittest.cc
|
| diff --git a/tools/json_schema_compiler/test/error_generation_unittest.cc b/tools/json_schema_compiler/test/error_generation_unittest.cc
|
| index 7812be629093cbf4b2b7a8458375c39f8606c28e..e55ecb988c73d3844e0be3ea834cec5266d77aa5 100644
|
| --- a/tools/json_schema_compiler/test/error_generation_unittest.cc
|
| +++ b/tools/json_schema_compiler/test/error_generation_unittest.cc
|
| @@ -36,7 +36,7 @@ testing::AssertionResult EqualsUtf16(const std::string& expected,
|
| TEST(JsonSchemaCompilerErrorTest, RequiredPropertyPopulate) {
|
| {
|
| std::unique_ptr<base::DictionaryValue> value =
|
| - Dictionary("string", new base::StringValue("bling"));
|
| + Dictionary("string", new base::Value("bling"));
|
| EXPECT_TRUE(EqualsUtf16("", GetPopulateError<TestType>(*value)));
|
| }
|
| {
|
| @@ -113,7 +113,7 @@ TEST(JsonSchemaCompilerErrorTest, ParamIsRequired) {
|
| TEST(JsonSchemaCompilerErrorTest, WrongPropertyValueType) {
|
| {
|
| std::unique_ptr<base::DictionaryValue> value =
|
| - Dictionary("string", new base::StringValue("yes"));
|
| + Dictionary("string", new base::Value("yes"));
|
| EXPECT_TRUE(EqualsUtf16("", GetPopulateError<TestType>(*value)));
|
| }
|
| {
|
| @@ -128,7 +128,7 @@ TEST(JsonSchemaCompilerErrorTest, WrongParameterCreationType) {
|
| {
|
| base::string16 error;
|
| std::unique_ptr<base::ListValue> params_value =
|
| - List(new base::StringValue("Yeah!"));
|
| + List(new base::Value("Yeah!"));
|
| EXPECT_TRUE(TestString::Params::Create(*params_value, &error));
|
| }
|
| {
|
| @@ -205,12 +205,12 @@ TEST(JsonSchemaCompilerErrorTest, ListExpected) {
|
| TEST(JsonSchemaCompilerErrorTest, BadEnumValue) {
|
| {
|
| std::unique_ptr<base::DictionaryValue> value =
|
| - Dictionary("enumeration", new base::StringValue("one"));
|
| + Dictionary("enumeration", new base::Value("one"));
|
| EXPECT_TRUE(EqualsUtf16("", GetPopulateError<HasEnumeration>(*value)));
|
| }
|
| {
|
| std::unique_ptr<base::DictionaryValue> value =
|
| - Dictionary("enumeration", new base::StringValue("bad sauce"));
|
| + Dictionary("enumeration", new base::Value("bad sauce"));
|
| EXPECT_TRUE(EqualsUtf16("'Enumeration': expected \"one\" or \"two\" "
|
| "or \"three\", got \"bad sauce\"",
|
| GetPopulateError<HasEnumeration>(*value)));
|
| @@ -222,7 +222,7 @@ TEST(JsonSchemaCompilerErrorTest, BadEnumValue) {
|
| TEST(JsonSchemaCompilerErrorTest, WarnOnOptionalFailure) {
|
| {
|
| std::unique_ptr<base::DictionaryValue> value =
|
| - Dictionary("string", new base::StringValue("bling"));
|
| + Dictionary("string", new base::Value("bling"));
|
| EXPECT_TRUE(EqualsUtf16("", GetPopulateError<OptionalTestType>(*value)));
|
| }
|
| {
|
| @@ -318,13 +318,13 @@ TEST(JsonSchemaCompilerErrorTest, MultiplePopulationErrors) {
|
| TEST(JsonSchemaCompilerErrorTest, TooManyKeys) {
|
| {
|
| std::unique_ptr<base::DictionaryValue> value =
|
| - Dictionary("string", new base::StringValue("yes"));
|
| + Dictionary("string", new base::Value("yes"));
|
| EXPECT_TRUE(EqualsUtf16("", GetPopulateError<TestType>(*value)));
|
| }
|
| {
|
| std::unique_ptr<base::DictionaryValue> value =
|
| - Dictionary("string", new base::StringValue("yes"), "ohno",
|
| - new base::StringValue("many values"));
|
| + Dictionary("string", new base::Value("yes"), "ohno",
|
| + new base::Value("many values"));
|
| EXPECT_TRUE(EqualsUtf16("found unexpected key 'ohno'",
|
| GetPopulateError<TestType>(*value)));
|
| }
|
|
|