Revert "Remove OwnPtr from Blink."

third_party/WebKit/Source/core/loader/ThreadableLoaderTest.cpp

Index: third_party/WebKit/Source/core/loader/ThreadableLoaderTest.cpp
diff --git a/third_party/WebKit/Source/core/loader/ThreadableLoaderTest.cpp b/third_party/WebKit/Source/core/loader/ThreadableLoaderTest.cpp
index 39e72b0fb4bbdb5382bab440a9244e0bb628f599..b2a664b6e087dac948669074270fab83ca27063a 100644
--- a/third_party/WebKit/Source/core/loader/ThreadableLoaderTest.cpp
+++ b/third_party/WebKit/Source/core/loader/ThreadableLoaderTest.cpp
@@ -30,9 +30,9 @@
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "wtf/Assertions.h"
-#include "wtf/PtrUtil.h"
+#include "wtf/OwnPtr.h"
+#include "wtf/PassOwnPtr.h"
 #include "wtf/RefPtr.h"
-#include <memory>
 
 namespace blink {
 
@@ -47,13 +47,13 @@ using Checkpoint = ::testing::StrictMock<::testing::MockFunction<void(int)>>;
 
 class MockThreadableLoaderClient : public ThreadableLoaderClient {
 public:
-    static std::unique_ptr<MockThreadableLoaderClient> create()
+    static PassOwnPtr<MockThreadableLoaderClient> create()
     {
-        return wrapUnique(new ::testing::StrictMock<MockThreadableLoaderClient>);
+        return adoptPtr(new ::testing::StrictMock<MockThreadableLoaderClient>);
     }
     MOCK_METHOD2(didSendData, void(unsigned long long, unsigned long long));
     MOCK_METHOD3(didReceiveResponseMock, void(unsigned long, const ResourceResponse&, WebDataConsumerHandle*));
-    void didReceiveResponse(unsigned long identifier, const ResourceResponse& response, std::unique_ptr<WebDataConsumerHandle> handle)
+    void didReceiveResponse(unsigned long identifier, const ResourceResponse& response, PassOwnPtr<WebDataConsumerHandle> handle)
     {
         didReceiveResponseMock(identifier, response, handle.get());
     }
@@ -146,9 +146,9 @@ public:
 private:
     Document& document() { return m_dummyPageHolder->document(); }
 
-    std::unique_ptr<DummyPageHolder> m_dummyPageHolder;
+    OwnPtr<DummyPageHolder> m_dummyPageHolder;
     Checkpoint m_checkpoint;
-    std::unique_ptr<DocumentThreadableLoader> m_loader;
+    OwnPtr<DocumentThreadableLoader> m_loader;
 };
 
 class WorkerThreadableLoaderTestHelper : public ThreadableLoaderTestHelper, public WorkerLoaderProxyProvider {
@@ -160,7 +160,7 @@ public:
 
     void createLoader(ThreadableLoaderClient* client, CrossOriginRequestPolicy crossOriginRequestPolicy) override
     {
-        std::unique_ptr<WaitableEvent> completionEvent = wrapUnique(new WaitableEvent());
+        OwnPtr<WaitableEvent> completionEvent = adoptPtr(new WaitableEvent());
         postTaskToWorkerGlobalScope(createCrossThreadTask(
             &WorkerThreadableLoaderTestHelper::workerCreateLoader,
             AllowCrossThreadAccess(this),
@@ -172,7 +172,7 @@ public:
 
     void startLoader(const ResourceRequest& request) override
     {
-        std::unique_ptr<WaitableEvent> completionEvent = wrapUnique(new WaitableEvent());
+        OwnPtr<WaitableEvent> completionEvent = adoptPtr(new WaitableEvent());
         postTaskToWorkerGlobalScope(createCrossThreadTask(
             &WorkerThreadableLoaderTestHelper::workerStartLoader,
             AllowCrossThreadAccess(this),
@@ -206,7 +206,7 @@ public:
     {
         testing::runPendingTasks();
 
-        std::unique_ptr<WaitableEvent> completionEvent = wrapUnique(new WaitableEvent());
+        OwnPtr<WaitableEvent> completionEvent = adoptPtr(new WaitableEvent());
         postTaskToWorkerGlobalScope(createCrossThreadTask(
             &WorkerThreadableLoaderTestHelper::workerCallCheckpoint,
             AllowCrossThreadAccess(this),
@@ -217,9 +217,9 @@ public:
 
     void onSetUp() override
     {
-        m_mockWorkerReportingProxy = wrapUnique(new MockWorkerReportingProxy());
+        m_mockWorkerReportingProxy = adoptPtr(new MockWorkerReportingProxy());
         m_securityOrigin = document().getSecurityOrigin();
-        m_workerThread = wrapUnique(new WorkerThreadForTest(
+        m_workerThread = adoptPtr(new WorkerThreadForTest(
             this,
             *m_mockWorkerReportingProxy));
 
@@ -276,7 +276,7 @@ private:
         event->signal();
     }
 
-    void workerStartLoader(WaitableEvent* event, std::unique_ptr<CrossThreadResourceRequestData> requestData)
+    void workerStartLoader(WaitableEvent* event, PassOwnPtr<CrossThreadResourceRequestData> requestData)
     {
         ASSERT(m_workerThread);
         ASSERT(m_workerThread->isCurrentThread());
@@ -310,13 +310,13 @@ private:
     }
 
     RefPtr<SecurityOrigin> m_securityOrigin;
-    std::unique_ptr<MockWorkerReportingProxy> m_mockWorkerReportingProxy;
-    std::unique_ptr<WorkerThreadForTest> m_workerThread;
+    OwnPtr<MockWorkerReportingProxy> m_mockWorkerReportingProxy;
+    OwnPtr<WorkerThreadForTest> m_workerThread;
 
-    std::unique_ptr<DummyPageHolder> m_dummyPageHolder;
+    OwnPtr<DummyPageHolder> m_dummyPageHolder;
     Checkpoint m_checkpoint;
     // |m_loader| must be touched only from the worker thread only.
-    std::unique_ptr<ThreadableLoader> m_loader;
+    OwnPtr<ThreadableLoader> m_loader;
 };
 
 class ThreadableLoaderTest : public ::testing::TestWithParam<ThreadableLoaderToTest> {
@@ -325,10 +325,10 @@ public:
     {
         switch (GetParam()) {
         case DocumentThreadableLoaderTest:
-            m_helper = wrapUnique(new DocumentThreadableLoaderTestHelper);
+            m_helper = adoptPtr(new DocumentThreadableLoaderTestHelper);
             break;
         case WorkerThreadableLoaderTest:
-            m_helper = wrapUnique(new WorkerThreadableLoaderTestHelper);
+            m_helper = adoptPtr(new WorkerThreadableLoaderTestHelper);
             break;
         }
     }
@@ -424,8 +424,8 @@ private:
         URLTestHelpers::registerMockedURLLoadWithCustomResponse(url, "fox-null-terminated.html", "", response);
     }
 
-    std::unique_ptr<MockThreadableLoaderClient> m_client;
-    std::unique_ptr<ThreadableLoaderTestHelper> m_helper;
+    OwnPtr<MockThreadableLoaderClient> m_client;
+    OwnPtr<ThreadableLoaderTestHelper> m_helper;
 };
 
 INSTANTIATE_TEST_CASE_P(Document,