Revert "Remove OwnPtr from Blink."

third_party/WebKit/Source/modules/fetch/DataConsumerHandleTestUtil.cpp

 // Copyright 2015 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 "modules/fetch/DataConsumerHandleTestUtil.h"
 
 #include "bindings/core/v8/DOMWrapperWorld.h"
-#include "wtf/PtrUtil.h"
-#include <memory>
 
 namespace blink {
 
 DataConsumerHandleTestUtil::Thread::Thread(const char* name, InitializationPolicy initializationPolicy)
     : m_thread(WebThreadSupportingGC::create(name))
     , m_initializationPolicy(initializationPolicy)
-    , m_waitableEvent(wrapUnique(new WaitableEvent()))
+    , m_waitableEvent(adoptPtr(new WaitableEvent()))
 {
     m_thread->postTask(BLINK_FROM_HERE, threadSafeBind(&Thread::initialize, AllowCrossThreadAccess(this)));
     m_waitableEvent->wait();
 }
 
 DataConsumerHandleTestUtil::Thread::~Thread()
 {
     m_thread->postTask(BLINK_FROM_HERE, threadSafeBind(&Thread::shutdown, AllowCrossThreadAccess(this)));
     m_waitableEvent->wait();
 }
 
 void DataConsumerHandleTestUtil::Thread::initialize()
 {
     if (m_initializationPolicy >= ScriptExecution) {
-        m_isolateHolder = wrapUnique(new gin::IsolateHolder());
+        m_isolateHolder = adoptPtr(new gin::IsolateHolder());
         isolate()->Enter();
     }
     m_thread->initialize();
     if (m_initializationPolicy >= ScriptExecution) {
         v8::HandleScope handleScope(isolate());
         m_scriptState = ScriptState::create(v8::Context::New(isolate()), DOMWrapperWorld::create(isolate()));
     }
     if (m_initializationPolicy >= WithExecutionContext) {
         m_executionContext = new NullExecutionContext();
     }
@@ skipping 118 matching lines @@
     consume(readSize);
     return Ok;
 }
 
 DataConsumerHandleTestUtil::ReplayingHandle::Context::Context()
     : m_offset(0)
     , m_readerThread(nullptr)
     , m_client(nullptr)
     , m_result(ShouldWait)
     , m_isHandleAttached(true)
-    , m_detached(wrapUnique(new WaitableEvent()))
+    , m_detached(adoptPtr(new WaitableEvent()))
 {
 }
 
 const DataConsumerHandleTestUtil::Command& DataConsumerHandleTestUtil::ReplayingHandle::Context::top()
 {
     ASSERT(!isEmpty());
     return m_commands.first();
 }
 
 void DataConsumerHandleTestUtil::ReplayingHandle::Context::consume(size_t size)
@@ skipping 43 matching lines @@
 WebDataConsumerHandle::Reader* DataConsumerHandleTestUtil::ReplayingHandle::obtainReaderInternal(Client* client)
 {
     return new ReaderImpl(m_context, client);
 }
 
 void DataConsumerHandleTestUtil::ReplayingHandle::add(const Command& command)
 {
     m_context->add(command);
 }
 
-DataConsumerHandleTestUtil::HandleReader::HandleReader(std::unique_ptr<WebDataConsumerHandle> handle, std::unique_ptr<OnFinishedReading> onFinishedReading)
+DataConsumerHandleTestUtil::HandleReader::HandleReader(PassOwnPtr<WebDataConsumerHandle> handle, std::unique_ptr<OnFinishedReading> onFinishedReading)
     : m_reader(handle->obtainReader(this))
     , m_onFinishedReading(std::move(onFinishedReading))
 {
 }
 
 void DataConsumerHandleTestUtil::HandleReader::didGetReadable()
 {
     WebDataConsumerHandle::Result r = WebDataConsumerHandle::UnexpectedError;
     char buffer[3];
     while (true) {
         size_t size;
         r = m_reader->read(buffer, sizeof(buffer), WebDataConsumerHandle::FlagNone, &size);
         if (r == WebDataConsumerHandle::ShouldWait)
             return;
         if (r != WebDataConsumerHandle::Ok)
             break;
         m_data.append(buffer, size);
     }
-    std::unique_ptr<HandleReadResult> result = wrapUnique(new HandleReadResult(r, m_data));
+    OwnPtr<HandleReadResult> result = adoptPtr(new HandleReadResult(r, m_data));
     m_data.clear();
-    Platform::current()->currentThread()->getWebTaskRunner()->postTask(BLINK_FROM_HERE, WTF::bind(&HandleReader::runOnFinishedReading, this, passed(std::move(result))));
+    Platform::current()->currentThread()->getWebTaskRunner()->postTask(BLINK_FROM_HERE, bind(&HandleReader::runOnFinishedReading, this, passed(std::move(result))));
     m_reader = nullptr;
 }
 
-void DataConsumerHandleTestUtil::HandleReader::runOnFinishedReading(std::unique_ptr<HandleReadResult> result)
+void DataConsumerHandleTestUtil::HandleReader::runOnFinishedReading(PassOwnPtr<HandleReadResult> result)
 {
     ASSERT(m_onFinishedReading);
     std::unique_ptr<OnFinishedReading> onFinishedReading(std::move(m_onFinishedReading));
     (*onFinishedReading)(std::move(result));
 }
 
-DataConsumerHandleTestUtil::HandleTwoPhaseReader::HandleTwoPhaseReader(std::unique_ptr<WebDataConsumerHandle> handle, std::unique_ptr<OnFinishedReading> onFinishedReading)
+DataConsumerHandleTestUtil::HandleTwoPhaseReader::HandleTwoPhaseReader(PassOwnPtr<WebDataConsumerHandle> handle, std::unique_ptr<OnFinishedReading> onFinishedReading)
     : m_reader(handle->obtainReader(this))
     , m_onFinishedReading(std::move(onFinishedReading))
 {
 }
 
 void DataConsumerHandleTestUtil::HandleTwoPhaseReader::didGetReadable()
 {
     WebDataConsumerHandle::Result r = WebDataConsumerHandle::UnexpectedError;
     while (true) {
         const void* buffer = nullptr;
         size_t size;
         r = m_reader->beginRead(&buffer, WebDataConsumerHandle::FlagNone, &size);
         if (r == WebDataConsumerHandle::ShouldWait)
             return;
         if (r != WebDataConsumerHandle::Ok)
             break;
         // Read smaller than available in order to test |endRead|.
         size_t readSize = std::min(size, std::max(size * 2 / 3, static_cast<size_t>(1)));
         m_data.append(static_cast<const char*>(buffer), readSize);
         m_reader->endRead(readSize);
     }
-    std::unique_ptr<HandleReadResult> result = wrapUnique(new HandleReadResult(r, m_data));
+    OwnPtr<HandleReadResult> result = adoptPtr(new HandleReadResult(r, m_data));
     m_data.clear();
-    Platform::current()->currentThread()->getWebTaskRunner()->postTask(BLINK_FROM_HERE, WTF::bind(&HandleTwoPhaseReader::runOnFinishedReading, this, passed(std::move(result))));
+    Platform::current()->currentThread()->getWebTaskRunner()->postTask(BLINK_FROM_HERE, bind(&HandleTwoPhaseReader::runOnFinishedReading, this, passed(std::move(result))));
     m_reader = nullptr;
 }
 
-void DataConsumerHandleTestUtil::HandleTwoPhaseReader::runOnFinishedReading(std::unique_ptr<HandleReadResult> result)
+void DataConsumerHandleTestUtil::HandleTwoPhaseReader::runOnFinishedReading(PassOwnPtr<HandleReadResult> result)
 {
     ASSERT(m_onFinishedReading);
     std::unique_ptr<OnFinishedReading> onFinishedReading(std::move(m_onFinishedReading));
     (*onFinishedReading)(std::move(result));
 }
 
 } // namespace blink