| 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 86ce492012929783e14c17bea0716773a2ce4a7c..273512e2577d733a775214a8c520508019ab4b0f 100644
|
| --- a/tools/json_schema_compiler/test/functions_on_types_unittest.cc
|
| +++ b/tools/json_schema_compiler/test/functions_on_types_unittest.cc
|
| @@ -10,36 +10,36 @@ using namespace test::api::functions_on_types;
|
|
|
| TEST(JsonSchemaCompilerFunctionsOnTypesTest, StorageAreaGetParamsCreate) {
|
| {
|
| - scoped_ptr<base::ListValue> params_value(new base::ListValue());
|
| - scoped_ptr<StorageArea::Get::Params> params(
|
| + std::unique_ptr<base::ListValue> params_value(new base::ListValue());
|
| + std::unique_ptr<StorageArea::Get::Params> params(
|
| StorageArea::Get::Params::Create(*params_value));
|
| ASSERT_TRUE(params);
|
| EXPECT_FALSE(params->keys);
|
| }
|
| {
|
| - scoped_ptr<base::ListValue> params_value(new base::ListValue());
|
| + std::unique_ptr<base::ListValue> params_value(new base::ListValue());
|
| params_value->Append(new base::FundamentalValue(9));
|
| - scoped_ptr<StorageArea::Get::Params> params(
|
| + std::unique_ptr<StorageArea::Get::Params> params(
|
| StorageArea::Get::Params::Create(*params_value));
|
| EXPECT_FALSE(params);
|
| }
|
| {
|
| - scoped_ptr<base::ListValue> params_value(new base::ListValue());
|
| + std::unique_ptr<base::ListValue> params_value(new base::ListValue());
|
| params_value->Append(new base::StringValue("test"));
|
| - scoped_ptr<StorageArea::Get::Params> params(
|
| + std::unique_ptr<StorageArea::Get::Params> params(
|
| StorageArea::Get::Params::Create(*params_value));
|
| ASSERT_TRUE(params);
|
| ASSERT_TRUE(params->keys);
|
| EXPECT_EQ("test", *params->keys->as_string);
|
| }
|
| {
|
| - scoped_ptr<base::DictionaryValue> keys_object_value(
|
| + std::unique_ptr<base::DictionaryValue> keys_object_value(
|
| new base::DictionaryValue());
|
| keys_object_value->SetInteger("integer", 5);
|
| keys_object_value->SetString("string", "string");
|
| - scoped_ptr<base::ListValue> params_value(new base::ListValue());
|
| + std::unique_ptr<base::ListValue> params_value(new base::ListValue());
|
| params_value->Append(keys_object_value->DeepCopy());
|
| - scoped_ptr<StorageArea::Get::Params> params(
|
| + std::unique_ptr<StorageArea::Get::Params> params(
|
| StorageArea::Get::Params::Create(*params_value));
|
| ASSERT_TRUE(params);
|
| ASSERT_TRUE(params->keys);
|
| @@ -52,7 +52,7 @@ TEST(JsonSchemaCompilerFunctionsOnTypesTest, StorageAreaGetResultCreate) {
|
| StorageArea::Get::Results::Items items;
|
| items.additional_properties.SetDouble("asdf", 0.1);
|
| items.additional_properties.SetString("sdfg", "zxcv");
|
| - scoped_ptr<base::ListValue> results =
|
| + std::unique_ptr<base::ListValue> results =
|
| StorageArea::Get::Results::Create(items);
|
| base::DictionaryValue* item_result = NULL;
|
| ASSERT_TRUE(results->GetDictionary(0, &item_result));
|
| @@ -60,11 +60,12 @@ TEST(JsonSchemaCompilerFunctionsOnTypesTest, StorageAreaGetResultCreate) {
|
| }
|
|
|
| TEST(JsonSchemaCompilerFunctionsOnTypesTest, ChromeSettingGetParamsCreate) {
|
| - scoped_ptr<base::DictionaryValue> details_value(new base::DictionaryValue());
|
| + std::unique_ptr<base::DictionaryValue> details_value(
|
| + new base::DictionaryValue());
|
| details_value->SetBoolean("incognito", true);
|
| - scoped_ptr<base::ListValue> params_value(new base::ListValue());
|
| + std::unique_ptr<base::ListValue> params_value(new base::ListValue());
|
| params_value->Append(details_value.release());
|
| - scoped_ptr<ChromeSetting::Get::Params> params(
|
| + std::unique_ptr<ChromeSetting::Get::Params> params(
|
| ChromeSetting::Get::Params::Create(*params_value));
|
| EXPECT_TRUE(params.get());
|
| EXPECT_TRUE(*params->details.incognito);
|
|
|