Convert //content from scoped_ptr to std::unique_ptr

content/public/test/test_utils.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/public/test/test_utils.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 52 matching lines @@
   BrowserThread::PostTask(thread_id, FROM_HERE, quit_task);
 }
 
 // Class used to handle result callbacks for ExecuteScriptAndGetValue.
 class ScriptCallback {
  public:
   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);
 };
 
 void ScriptCallback::ResultCallback(const base::Value* result) {
   if (result)
     result_.reset(result->DeepCopy());
   base::MessageLoop::current()->QuitWhenIdle();
 }
 
@@ skipping 87 matching lines @@
     if (!task_observer.processed())
       break;
   }
 }
 
 base::Closure GetQuitTaskForRunLoop(base::RunLoop* run_loop) {
   return base::Bind(&DeferredQuitRunLoop, run_loop->QuitClosure(),
                     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(
       base::UTF8ToUTF16(script),
       base::Bind(&ScriptCallback::ResultCallback, base::Unretained(&observer)));
   base::MessageLoop* loop = base::MessageLoop::current();
   loop->Run();
   return observer.result();
 }
 
@@ skipping 184 matching lines @@
 
 void WebContentsDestroyedWatcher::Wait() {
   message_loop_runner_->Run();
 }
 
 void WebContentsDestroyedWatcher::WebContentsDestroyed() {
   message_loop_runner_->Quit();
 }
 
 }  // namespace content