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

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

Issue 1544333002: Convert Pass()→std::move() in //tools (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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
« no previous file with comments | « tools/json_schema_compiler/test/simple_api_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
« no previous file with comments | « tools/json_schema_compiler/test/simple_api_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698