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

Unified Diff: content/public/test/test_utils.cc

Issue 1544293002: Convert Pass()→std::move() in //content (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
Index: content/public/test/test_utils.cc
diff --git a/content/public/test/test_utils.cc b/content/public/test/test_utils.cc
index b2c9347659d96fb9a6cccf8ddc008008e865d1ff..66a493a62530bf04b47ea09833fa54d5de116a1f 100644
--- a/content/public/test/test_utils.cc
+++ b/content/public/test/test_utils.cc
@@ -4,6 +4,8 @@
#include "content/public/test/test_utils.h"
+#include <utility>
+
#include "base/bind.h"
#include "base/command_line.h"
#include "base/location.h"
@@ -68,7 +70,7 @@ class ScriptCallback {
virtual ~ScriptCallback() { }
void ResultCallback(const base::Value* result);
- scoped_ptr<base::Value> result() { return result_.Pass(); }
+ scoped_ptr<base::Value> result() { return std::move(result_); }
private:
scoped_ptr<base::Value> result_;
@@ -190,7 +192,7 @@ scoped_ptr<base::Value> ExecuteScriptAndGetValue(
base::Bind(&ScriptCallback::ResultCallback, base::Unretained(&observer)));
base::MessageLoop* loop = base::MessageLoop::current();
loop->Run();
- return observer.result().Pass();
+ return observer.result();
}
bool AreAllSitesIsolatedForTesting() {
« no previous file with comments | « content/public/test/test_mojo_app.cc ('k') | content/shell/browser/layout_test/layout_test_bluetooth_adapter_provider.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698