| Index: tools/json_schema_compiler/test/functions_on_types_unittest.cc
|
| diff --git a/tools/json_schema_compiler/test/functions_on_types_unittest.cc b/tools/json_schema_compiler/test/functions_on_types_unittest.cc
|
| index 6fe4526db507b18cd10f80fe015b5adeac2b4c87..f96a5f7283de6e34ff436da95a0faf7c9395db53 100644
|
| --- a/tools/json_schema_compiler/test/functions_on_types_unittest.cc
|
| +++ b/tools/json_schema_compiler/test/functions_on_types_unittest.cc
|
| @@ -10,22 +10,22 @@ using namespace test::api::functions_on_types;
|
|
|
| TEST(JsonSchemaCompilerFunctionsOnTypesTest, StorageAreaGetParamsCreate) {
|
| {
|
| - scoped_ptr<ListValue> params_value(new ListValue());
|
| + scoped_ptr<base::ListValue> params_value(new base::ListValue());
|
| scoped_ptr<StorageArea::Get::Params> params(
|
| StorageArea::Get::Params::Create(*params_value));
|
| ASSERT_TRUE(params);
|
| EXPECT_FALSE(params->keys);
|
| }
|
| {
|
| - scoped_ptr<ListValue> params_value(new ListValue());
|
| - params_value->Append(Value::CreateIntegerValue(9));
|
| + scoped_ptr<base::ListValue> params_value(new base::ListValue());
|
| + params_value->Append(base::Value::CreateIntegerValue(9));
|
| scoped_ptr<StorageArea::Get::Params> params(
|
| StorageArea::Get::Params::Create(*params_value));
|
| EXPECT_FALSE(params);
|
| }
|
| {
|
| - scoped_ptr<ListValue> params_value(new ListValue());
|
| - params_value->Append(Value::CreateStringValue("test"));
|
| + scoped_ptr<base::ListValue> params_value(new base::ListValue());
|
| + params_value->Append(base::Value::CreateStringValue("test"));
|
| scoped_ptr<StorageArea::Get::Params> params(
|
| StorageArea::Get::Params::Create(*params_value));
|
| ASSERT_TRUE(params);
|
| @@ -33,10 +33,11 @@ TEST(JsonSchemaCompilerFunctionsOnTypesTest, StorageAreaGetParamsCreate) {
|
| EXPECT_EQ("test", *params->keys->as_string);
|
| }
|
| {
|
| - scoped_ptr<DictionaryValue> keys_object_value(new DictionaryValue());
|
| + scoped_ptr<base::DictionaryValue> keys_object_value(
|
| + new base::DictionaryValue());
|
| keys_object_value->SetInteger("integer", 5);
|
| keys_object_value->SetString("string", "string");
|
| - scoped_ptr<ListValue> params_value(new ListValue());
|
| + scoped_ptr<base::ListValue> params_value(new base::ListValue());
|
| params_value->Append(keys_object_value->DeepCopy());
|
| scoped_ptr<StorageArea::Get::Params> params(
|
| StorageArea::Get::Params::Create(*params_value));
|
| @@ -51,16 +52,17 @@ TEST(JsonSchemaCompilerFunctionsOnTypesTest, StorageAreaGetResultCreate) {
|
| StorageArea::Get::Results::Items items;
|
| items.additional_properties.SetDouble("asdf", 0.1);
|
| items.additional_properties.SetString("sdfg", "zxcv");
|
| - scoped_ptr<ListValue> results = StorageArea::Get::Results::Create(items);
|
| - DictionaryValue* item_result = NULL;
|
| + scoped_ptr<base::ListValue> results =
|
| + StorageArea::Get::Results::Create(items);
|
| + base::DictionaryValue* item_result = NULL;
|
| ASSERT_TRUE(results->GetDictionary(0, &item_result));
|
| EXPECT_TRUE(item_result->Equals(&items.additional_properties));
|
| }
|
|
|
| TEST(JsonSchemaCompilerFunctionsOnTypesTest, ChromeSettingGetParamsCreate) {
|
| - scoped_ptr<DictionaryValue> details_value(new DictionaryValue());
|
| + scoped_ptr<base::DictionaryValue> details_value(new base::DictionaryValue());
|
| details_value->SetBoolean("incognito", true);
|
| - scoped_ptr<ListValue> params_value(new ListValue());
|
| + scoped_ptr<base::ListValue> params_value(new base::ListValue());
|
| params_value->Append(details_value.release());
|
| scoped_ptr<ChromeSetting::Get::Params> params(
|
| ChromeSetting::Get::Params::Create(*params_value));
|
|
|