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

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

Issue 1874903002: Convert //content from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix indent 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
« no previous file with comments | « content/public/test/test_utils.h ('k') | content/public/test/test_web_contents_factory.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/public/test/test_utils.cc
diff --git a/content/public/test/test_utils.cc b/content/public/test/test_utils.cc
index 2d12dd6db3d2b5dc3c62f0723fc482400d76aa2c..8912c91be0b6c7ebfdd032cb8077b21f56de49fa 100644
--- a/content/public/test/test_utils.cc
+++ b/content/public/test/test_utils.cc
@@ -70,10 +70,10 @@ class ScriptCallback {
virtual ~ScriptCallback() { }
void ResultCallback(const base::Value* result);
- scoped_ptr<base::Value> result() { return std::move(result_); }
+ std::unique_ptr<base::Value> result() { return std::move(result_); }
private:
- scoped_ptr<base::Value> result_;
+ std::unique_ptr<base::Value> result_;
DISALLOW_COPY_AND_ASSIGN(ScriptCallback);
};
@@ -181,8 +181,9 @@ base::Closure GetQuitTaskForRunLoop(base::RunLoop* run_loop) {
kNumQuitDeferrals);
}
-scoped_ptr<base::Value> ExecuteScriptAndGetValue(
- RenderFrameHost* render_frame_host, const std::string& script) {
+std::unique_ptr<base::Value> ExecuteScriptAndGetValue(
+ RenderFrameHost* render_frame_host,
+ const std::string& script) {
ScriptCallback observer;
render_frame_host->ExecuteJavaScriptForTests(
« no previous file with comments | « content/public/test/test_utils.h ('k') | content/public/test/test_web_contents_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698