Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(64)

Unified Diff: tools/json_schema_compiler/test/any_unittest.cc

Issue 1869503004: Convert //tools to use std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase, change iwyu fixes for converted directories to include <memory> Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 d10a3eb4ef486c1881933103600602094dceb08a..52587e7edee1ed7a533fb6b443f252bb2d3e392f 100644
--- a/tools/json_schema_compiler/test/any_unittest.cc
+++ b/tools/json_schema_compiler/test/any_unittest.cc
@@ -10,47 +10,47 @@ using namespace test::api::any;
TEST(JsonSchemaCompilerAnyTest, AnyTypePopulate) {
{
AnyType any_type;
- scoped_ptr<base::DictionaryValue> any_type_value(
+ std::unique_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<base::Value> any_type_to_value(any_type.ToValue());
+ std::unique_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<base::DictionaryValue> any_type_value(
+ std::unique_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<base::Value> any_type_to_value(any_type.ToValue());
+ std::unique_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<base::ListValue> params_value(new base::ListValue());
- scoped_ptr<OptionalAny::Params> params(
+ std::unique_ptr<base::ListValue> params_value(new base::ListValue());
+ std::unique_ptr<OptionalAny::Params> params(
OptionalAny::Params::Create(*params_value));
EXPECT_TRUE(params.get());
EXPECT_FALSE(params->any_name.get());
}
{
- scoped_ptr<base::ListValue> params_value(new base::ListValue());
- scoped_ptr<base::Value> param(new base::StringValue("asdf"));
+ std::unique_ptr<base::ListValue> params_value(new base::ListValue());
+ std::unique_ptr<base::Value> param(new base::StringValue("asdf"));
params_value->Append(param->DeepCopy());
- scoped_ptr<OptionalAny::Params> params(
+ std::unique_ptr<OptionalAny::Params> params(
OptionalAny::Params::Create(*params_value));
ASSERT_TRUE(params);
ASSERT_TRUE(params->any_name);
EXPECT_TRUE(params->any_name->Equals(param.get()));
}
{
- scoped_ptr<base::ListValue> params_value(new base::ListValue());
- scoped_ptr<base::Value> param(new base::FundamentalValue(true));
+ std::unique_ptr<base::ListValue> params_value(new base::ListValue());
+ std::unique_ptr<base::Value> param(new base::FundamentalValue(true));
params_value->Append(param->DeepCopy());
- scoped_ptr<OptionalAny::Params> params(
+ std::unique_ptr<OptionalAny::Params> params(
OptionalAny::Params::Create(*params_value));
ASSERT_TRUE(params);
ASSERT_TRUE(params->any_name);
« no previous file with comments | « tools/json_schema_compiler/test/additional_properties_unittest.cc ('k') | tools/json_schema_compiler/test/arrays_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698