Chromium Code Reviews| Index: tools/gn/functions_unittest.cc |
| diff --git a/tools/gn/functions_unittest.cc b/tools/gn/functions_unittest.cc |
| index e2f67567ab90017044a931dee5008a79e01ea100..28ef1ccf9c292d019bcfe3adb9aaa4946138cd8b 100644 |
| --- a/tools/gn/functions_unittest.cc |
| +++ b/tools/gn/functions_unittest.cc |
| @@ -21,7 +21,7 @@ TEST(Functions, Defined) { |
| Token undefined_token(Location(), Token::IDENTIFIER, "undef"); |
| ListNode args_list_identifier_undefined; |
| args_list_identifier_undefined.append_item( |
| - scoped_ptr<ParseNode>(new IdentifierNode(undefined_token))); |
| + std::unique_ptr<ParseNode>(new IdentifierNode(undefined_token))); |
| Value result = functions::RunDefined(setup.scope(), &function_call, |
| &args_list_identifier_undefined, &err); |
| ASSERT_EQ(Value::BOOLEAN, result.type()); |
| @@ -30,14 +30,14 @@ TEST(Functions, Defined) { |
| // Define a value that's itself a scope value. |
| const char kDef[] = "def"; // Defined variable name. |
| setup.scope()->SetValue( |
| - kDef, Value(nullptr, scoped_ptr<Scope>(new Scope(setup.scope()))), |
| + kDef, Value(nullptr, std::unique_ptr<Scope>(new Scope(setup.scope()))), |
| nullptr); |
| // Test the defined identifier. |
| Token defined_token(Location(), Token::IDENTIFIER, kDef); |
| ListNode args_list_identifier_defined; |
| args_list_identifier_defined.append_item( |
| - scoped_ptr<ParseNode>(new IdentifierNode(defined_token))); |
| + std::unique_ptr<ParseNode>(new IdentifierNode(defined_token))); |
| result = functions::RunDefined(setup.scope(), &function_call, |
| &args_list_identifier_defined, &err); |
| ASSERT_EQ(Value::BOOLEAN, result.type()); |
| @@ -45,10 +45,10 @@ TEST(Functions, Defined) { |
| // Should also work by passing an accessor node so you can do |
| // "defined(def.foo)" to see if foo is defined on the def scope. |
| - scoped_ptr<AccessorNode> undef_accessor(new AccessorNode); |
| + std::unique_ptr<AccessorNode> undef_accessor(new AccessorNode); |
| undef_accessor->set_base(defined_token); |
| - undef_accessor->set_member(scoped_ptr<IdentifierNode>( |
| - new IdentifierNode(undefined_token))); |
| + undef_accessor->set_member( |
| + std::unique_ptr<IdentifierNode>(new IdentifierNode(undefined_token))); |
|
vmpstr
2016/04/06 21:12:29
This can be WrapUnique, but this is fine as well.
dcheng
2016/04/06 21:26:32
Done.
|
| ListNode args_list_accessor_defined; |
| args_list_accessor_defined.append_item(std::move(undef_accessor)); |
| result = functions::RunDefined(setup.scope(), &function_call, |