Revert "Remove OwnPtr from Blink."

third_party/WebKit/Source/platform/testing/TestingPlatformSupport.cpp

 /*
  * Copyright (C) 2014 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 12 matching lines @@
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "platform/testing/TestingPlatformSupport.h"
 
-#include "wtf/PtrUtil.h"
-#include <memory>
-
 namespace blink {
 
 TestingPlatformSupport::TestingPlatformSupport()
     : TestingPlatformSupport(TestingPlatformSupport::Config())
 {
 }
 
 TestingPlatformSupport::TestingPlatformSupport(const Config& config)
     : m_config(config)
     , m_oldPlatform(Platform::current())
@@ skipping 18 matching lines @@
 }
 
 WebThread* TestingPlatformSupport::currentThread()
 {
     return m_oldPlatform ? m_oldPlatform->currentThread() : nullptr;
 }
 
 class TestingPlatformMockWebTaskRunner : public WebTaskRunner {
     WTF_MAKE_NONCOPYABLE(TestingPlatformMockWebTaskRunner);
 public:
-    explicit TestingPlatformMockWebTaskRunner(Deque<std::unique_ptr<WebTaskRunner::Task>>* tasks) : m_tasks(tasks) { }
+    explicit TestingPlatformMockWebTaskRunner(Deque<OwnPtr<WebTaskRunner::Task>>* tasks) : m_tasks(tasks) { }
     ~TestingPlatformMockWebTaskRunner() override { }
 
     void postTask(const WebTraceLocation&, Task* task) override
     {
-        m_tasks->append(wrapUnique(task));
+        m_tasks->append(adoptPtr(task));
     }
 
     void postDelayedTask(const WebTraceLocation&, Task*, double delayMs) override
     {
         ASSERT_NOT_REACHED();
     }
 
     WebTaskRunner* clone() override
     {
         return new TestingPlatformMockWebTaskRunner(m_tasks);
     }
 
     double virtualTimeSeconds() const override
     {
         ASSERT_NOT_REACHED();
         return 0.0;
     }
 
     double monotonicallyIncreasingVirtualTimeSeconds() const override
     {
         ASSERT_NOT_REACHED();
         return 0.0;
     }
 
 private:
-    Deque<std::unique_ptr<WebTaskRunner::Task>>* m_tasks; // NOT OWNED
+    Deque<OwnPtr<WebTaskRunner::Task>>* m_tasks; // NOT OWNED
 };
 
 // TestingPlatformMockScheduler definition:
 
 TestingPlatformMockScheduler::TestingPlatformMockScheduler()
-    : m_mockWebTaskRunner(wrapUnique(new TestingPlatformMockWebTaskRunner(&m_tasks))) { }
+    : m_mockWebTaskRunner(adoptPtr(new TestingPlatformMockWebTaskRunner(&m_tasks))) { }
 
 TestingPlatformMockScheduler::~TestingPlatformMockScheduler() { }
 
 WebTaskRunner* TestingPlatformMockScheduler::loadingTaskRunner()
 {
     return m_mockWebTaskRunner.get();
 }
 
 WebTaskRunner* TestingPlatformMockScheduler::timerTaskRunner()
 {
     return m_mockWebTaskRunner.get();
 }
 
 void TestingPlatformMockScheduler::runSingleTask()
 {
     if (m_tasks.isEmpty())
         return;
     m_tasks.takeFirst()->run();
 }
 
 void TestingPlatformMockScheduler::runAllTasks()
 {
     while (!m_tasks.isEmpty())
         m_tasks.takeFirst()->run();
 }
 
 class TestingPlatformMockWebThread : public WebThread {
     WTF_MAKE_NONCOPYABLE(TestingPlatformMockWebThread);
 public:
-    TestingPlatformMockWebThread() : m_mockWebScheduler(wrapUnique(new TestingPlatformMockScheduler)) { }
+    TestingPlatformMockWebThread() : m_mockWebScheduler(adoptPtr(new TestingPlatformMockScheduler)) { }
     ~TestingPlatformMockWebThread() override { }
 
     WebTaskRunner* getWebTaskRunner() override
     {
         return m_mockWebScheduler->timerTaskRunner();
     }
 
     bool isCurrentThread() const override
     {
         ASSERT_NOT_REACHED();
         return true;
     }
 
     WebScheduler* scheduler() const override
     {
         return m_mockWebScheduler.get();
     }
 
     TestingPlatformMockScheduler* mockWebScheduler()
     {
         return m_mockWebScheduler.get();
     }
 
 private:
-    std::unique_ptr<TestingPlatformMockScheduler> m_mockWebScheduler;
+    OwnPtr<TestingPlatformMockScheduler> m_mockWebScheduler;
 };
 
 // TestingPlatformSupportWithMockScheduler definition:
 
 TestingPlatformSupportWithMockScheduler::TestingPlatformSupportWithMockScheduler()
-    : m_mockWebThread(wrapUnique(new TestingPlatformMockWebThread())) { }
+    : m_mockWebThread(adoptPtr(new TestingPlatformMockWebThread())) { }
 
 TestingPlatformSupportWithMockScheduler::TestingPlatformSupportWithMockScheduler(const Config& config)
     : TestingPlatformSupport(config)
-    , m_mockWebThread(wrapUnique(new TestingPlatformMockWebThread())) { }
+    , m_mockWebThread(adoptPtr(new TestingPlatformMockWebThread())) { }
 
 TestingPlatformSupportWithMockScheduler::~TestingPlatformSupportWithMockScheduler() { }
 
 WebThread* TestingPlatformSupportWithMockScheduler::currentThread()
 {
     return m_mockWebThread.get();
 }
 
 TestingPlatformMockScheduler* TestingPlatformSupportWithMockScheduler::mockWebScheduler()
 {
     return m_mockWebThread->mockWebScheduler();
 }
 
 } // namespace blink