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( |