| Index: tools/json_schema_compiler/test/test_util.cc
|
| diff --git a/tools/json_schema_compiler/test/test_util.cc b/tools/json_schema_compiler/test/test_util.cc
|
| index 79d5f7b9711b7094af4aac9031cf6f94bbde70ae..3dc04c9722cb840e98f7d918f12cf9ad9dcae663 100644
|
| --- a/tools/json_schema_compiler/test/test_util.cc
|
| +++ b/tools/json_schema_compiler/test/test_util.cc
|
| @@ -22,39 +22,39 @@ scoped_ptr<base::Value> ReadJson(const base::StringPiece& json) {
|
| &error_msg));
|
| // CHECK not ASSERT since passing invalid |json| is a test error.
|
| CHECK(result) << error_msg;
|
| - return result.Pass();
|
| + return result;
|
| }
|
|
|
| scoped_ptr<base::ListValue> List(base::Value* a) {
|
| scoped_ptr<base::ListValue> list(new base::ListValue());
|
| list->Append(a);
|
| - return list.Pass();
|
| + return list;
|
| }
|
| scoped_ptr<base::ListValue> List(base::Value* a, base::Value* b) {
|
| scoped_ptr<base::ListValue> list = List(a);
|
| list->Append(b);
|
| - return list.Pass();
|
| + return list;
|
| }
|
| scoped_ptr<base::ListValue> List(base::Value* a,
|
| base::Value* b,
|
| base::Value* c) {
|
| scoped_ptr<base::ListValue> list = List(a, b);
|
| list->Append(c);
|
| - return list.Pass();
|
| + return list;
|
| }
|
|
|
| scoped_ptr<base::DictionaryValue> Dictionary(
|
| const std::string& ak, base::Value* av) {
|
| scoped_ptr<base::DictionaryValue> dict(new base::DictionaryValue());
|
| dict->SetWithoutPathExpansion(ak, av);
|
| - return dict.Pass();
|
| + return dict;
|
| }
|
| scoped_ptr<base::DictionaryValue> Dictionary(
|
| const std::string& ak, base::Value* av,
|
| const std::string& bk, base::Value* bv) {
|
| scoped_ptr<base::DictionaryValue> dict = Dictionary(ak, av);
|
| dict->SetWithoutPathExpansion(bk, bv);
|
| - return dict.Pass();
|
| + return dict;
|
| }
|
| scoped_ptr<base::DictionaryValue> Dictionary(
|
| const std::string& ak, base::Value* av,
|
| @@ -62,7 +62,7 @@ scoped_ptr<base::DictionaryValue> Dictionary(
|
| const std::string& ck, base::Value* cv) {
|
| scoped_ptr<base::DictionaryValue> dict = Dictionary(ak, av, bk, bv);
|
| dict->SetWithoutPathExpansion(ck, cv);
|
| - return dict.Pass();
|
| + return dict;
|
| }
|
|
|
| } // namespace test_util
|
|
|