| Index: tools/json_schema_compiler/test/objects_unittest.cc
|
| diff --git a/tools/json_schema_compiler/test/objects_unittest.cc b/tools/json_schema_compiler/test/objects_unittest.cc
|
| index 5c00926b69ea9f089b5e75a76c0692fd37d20185..fffaff15d8f9634a550a8ff2c6d41549aa35629b 100644
|
| --- a/tools/json_schema_compiler/test/objects_unittest.cc
|
| +++ b/tools/json_schema_compiler/test/objects_unittest.cc
|
| @@ -16,17 +16,18 @@ using namespace test::api::objects_movable_json;
|
|
|
| TEST(JsonSchemaCompilerObjectsTest, ObjectParamParamsCreate) {
|
| {
|
| - scoped_ptr<base::ListValue> strings(new base::ListValue());
|
| + std::unique_ptr<base::ListValue> strings(new base::ListValue());
|
| strings->Append(new base::StringValue("one"));
|
| strings->Append(new base::StringValue("two"));
|
| - scoped_ptr<base::DictionaryValue> info_value(new base::DictionaryValue());
|
| + std::unique_ptr<base::DictionaryValue> info_value(
|
| + new base::DictionaryValue());
|
| info_value->Set("strings", strings.release());
|
| info_value->Set("integer", new base::FundamentalValue(5));
|
| info_value->Set("boolean", new base::FundamentalValue(true));
|
|
|
| - scoped_ptr<base::ListValue> params_value(new base::ListValue());
|
| + std::unique_ptr<base::ListValue> params_value(new base::ListValue());
|
| params_value->Append(info_value.release());
|
| - scoped_ptr<ObjectParam::Params> params(
|
| + std::unique_ptr<ObjectParam::Params> params(
|
| ObjectParam::Params::Create(*params_value));
|
| EXPECT_TRUE(params.get());
|
| EXPECT_EQ((size_t) 2, params->info.strings.size());
|
| @@ -36,16 +37,17 @@ TEST(JsonSchemaCompilerObjectsTest, ObjectParamParamsCreate) {
|
| EXPECT_TRUE(params->info.boolean);
|
| }
|
| {
|
| - scoped_ptr<base::ListValue> strings(new base::ListValue());
|
| + std::unique_ptr<base::ListValue> strings(new base::ListValue());
|
| strings->Append(new base::StringValue("one"));
|
| strings->Append(new base::StringValue("two"));
|
| - scoped_ptr<base::DictionaryValue> info_value(new base::DictionaryValue());
|
| + std::unique_ptr<base::DictionaryValue> info_value(
|
| + new base::DictionaryValue());
|
| info_value->Set("strings", strings.release());
|
| info_value->Set("integer", new base::FundamentalValue(5));
|
|
|
| - scoped_ptr<base::ListValue> params_value(new base::ListValue());
|
| + std::unique_ptr<base::ListValue> params_value(new base::ListValue());
|
| params_value->Append(info_value.release());
|
| - scoped_ptr<ObjectParam::Params> params(
|
| + std::unique_ptr<ObjectParam::Params> params(
|
| ObjectParam::Params::Create(*params_value));
|
| EXPECT_FALSE(params.get());
|
| }
|
| @@ -54,7 +56,8 @@ TEST(JsonSchemaCompilerObjectsTest, ObjectParamParamsCreate) {
|
| TEST(JsonSchemaCompilerObjectsTest, ReturnsObjectResultCreate) {
|
| ReturnsObject::Results::Info info;
|
| info.state = FIRST_STATE_FOO;
|
| - scoped_ptr<base::ListValue> results = ReturnsObject::Results::Create(info);
|
| + std::unique_ptr<base::ListValue> results =
|
| + ReturnsObject::Results::Create(info);
|
|
|
| base::DictionaryValue expected;
|
| expected.SetString("state", "foo");
|
| @@ -66,7 +69,7 @@ TEST(JsonSchemaCompilerObjectsTest, ReturnsObjectResultCreate) {
|
| TEST(JsonSchemaCompilerObjectsTest, OnObjectFiredCreate) {
|
| OnObjectFired::SomeObject object;
|
| object.state = FIRST_STATE_BAR;
|
| - scoped_ptr<base::ListValue> results(OnObjectFired::Create(object));
|
| + std::unique_ptr<base::ListValue> results(OnObjectFired::Create(object));
|
|
|
| base::DictionaryValue expected;
|
| expected.SetString("state", "bar");
|
|
|