Index: tools/json_schema_compiler/test/any_unittest.cc |
diff --git a/tools/json_schema_compiler/test/any_unittest.cc b/tools/json_schema_compiler/test/any_unittest.cc |
index 81fd6814e0bef11b578ea76a2174696d3ab4a928..7e3215f08f3f3b4c686096bfd067c76dc701feb9 100644 |
--- a/tools/json_schema_compiler/test/any_unittest.cc |
+++ b/tools/json_schema_compiler/test/any_unittest.cc |
@@ -10,33 +10,35 @@ using namespace test::api::any; |
TEST(JsonSchemaCompilerAnyTest, AnyTypePopulate) { |
{ |
AnyType any_type; |
- scoped_ptr<DictionaryValue> any_type_value(new DictionaryValue()); |
+ scoped_ptr<base::DictionaryValue> any_type_value( |
+ new base::DictionaryValue()); |
any_type_value->SetString("any", "value"); |
EXPECT_TRUE(AnyType::Populate(*any_type_value, &any_type)); |
- scoped_ptr<Value> any_type_to_value(any_type.ToValue()); |
+ scoped_ptr<base::Value> any_type_to_value(any_type.ToValue()); |
EXPECT_TRUE(any_type_value->Equals(any_type_to_value.get())); |
} |
{ |
AnyType any_type; |
- scoped_ptr<DictionaryValue> any_type_value(new DictionaryValue()); |
+ scoped_ptr<base::DictionaryValue> any_type_value( |
+ new base::DictionaryValue()); |
any_type_value->SetInteger("any", 5); |
EXPECT_TRUE(AnyType::Populate(*any_type_value, &any_type)); |
- scoped_ptr<Value> any_type_to_value(any_type.ToValue()); |
+ scoped_ptr<base::Value> any_type_to_value(any_type.ToValue()); |
EXPECT_TRUE(any_type_value->Equals(any_type_to_value.get())); |
} |
} |
TEST(JsonSchemaCompilerAnyTest, OptionalAnyParamsCreate) { |
{ |
- scoped_ptr<ListValue> params_value(new ListValue()); |
+ scoped_ptr<base::ListValue> params_value(new base::ListValue()); |
scoped_ptr<OptionalAny::Params> params( |
OptionalAny::Params::Create(*params_value)); |
EXPECT_TRUE(params.get()); |
EXPECT_FALSE(params->any_name.get()); |
} |
{ |
- scoped_ptr<ListValue> params_value(new ListValue()); |
- scoped_ptr<Value> param(Value::CreateStringValue("asdf")); |
+ scoped_ptr<base::ListValue> params_value(new base::ListValue()); |
+ scoped_ptr<base::Value> param(base::Value::CreateStringValue("asdf")); |
params_value->Append(param->DeepCopy()); |
scoped_ptr<OptionalAny::Params> params( |
OptionalAny::Params::Create(*params_value)); |
@@ -45,8 +47,8 @@ TEST(JsonSchemaCompilerAnyTest, OptionalAnyParamsCreate) { |
EXPECT_TRUE(params->any_name->Equals(param.get())); |
} |
{ |
- scoped_ptr<ListValue> params_value(new ListValue()); |
- scoped_ptr<Value> param(Value::CreateBooleanValue(true)); |
+ scoped_ptr<base::ListValue> params_value(new base::ListValue()); |
+ scoped_ptr<base::Value> param(base::Value::CreateBooleanValue(true)); |
params_value->Append(param->DeepCopy()); |
scoped_ptr<OptionalAny::Params> params( |
OptionalAny::Params::Create(*params_value)); |