Revert "Remove OwnPtr from Blink."

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

 // 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.
 
 #ifndef DataConsumerHandleTestUtil_h
 #define DataConsumerHandleTestUtil_h
 
 #include "bindings/core/v8/ScriptState.h"
 #include "core/testing/NullExecutionContext.h"
 #include "gin/public/isolate_holder.h"
 #include "modules/fetch/DataConsumerHandleUtil.h"
 #include "modules/fetch/FetchDataConsumerHandle.h"
 #include "modules/fetch/FetchDataLoader.h"
 #include "platform/ThreadSafeFunctional.h"
 #include "platform/WaitableEvent.h"
 #include "platform/WebThreadSupportingGC.h"
 #include "platform/heap/Handle.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebDataConsumerHandle.h"
 #include "public/platform/WebTraceLocation.h"
 #include "wtf/Deque.h"
 #include "wtf/Locker.h"
-#include "wtf/PtrUtil.h"
+#include "wtf/OwnPtr.h"
+#include "wtf/PassOwnPtr.h"
 #include "wtf/ThreadSafeRefCounted.h"
 #include "wtf/ThreadingPrimitives.h"
 #include "wtf/Vector.h"
+
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
-#include <memory>
 #include <v8.h>
 
 namespace blink {
 
 class DataConsumerHandleTestUtil {
     STATIC_ONLY(DataConsumerHandleTestUtil);
 public:
     class NoopClient final : public WebDataConsumerHandle::Client {
         DISALLOW_NEW();
     public:
@@ skipping 21 matching lines @@
 
         WebThreadSupportingGC* thread() { return m_thread.get(); }
         ExecutionContext* getExecutionContext() { return m_executionContext.get(); }
         ScriptState* getScriptState() { return m_scriptState.get(); }
         v8::Isolate* isolate() { return m_isolateHolder->isolate(); }
 
     private:
         void initialize();
         void shutdown();
 
-        std::unique_ptr<WebThreadSupportingGC> m_thread;
+        OwnPtr<WebThreadSupportingGC> m_thread;
         const InitializationPolicy m_initializationPolicy;
-        std::unique_ptr<WaitableEvent> m_waitableEvent;
+        OwnPtr<WaitableEvent> m_waitableEvent;
         Persistent<NullExecutionContext> m_executionContext;
-        std::unique_ptr<gin::IsolateHolder> m_isolateHolder;
+        OwnPtr<gin::IsolateHolder> m_isolateHolder;
         RefPtr<ScriptState> m_scriptState;
     };
 
     class ThreadingTestBase : public ThreadSafeRefCounted<ThreadingTestBase> {
     public:
         virtual ~ThreadingTestBase() { }
 
         class ThreadHolder;
 
         class Context : public ThreadSafeRefCounted<Context> {
@@ skipping 66 matching lines @@
             // here is safe.
             ThreadHolder* m_holder;
         };
 
         // The reading/updating threads are alive while ThreadHolder is alive.
         class ThreadHolder {
             DISALLOW_NEW();
         public:
             ThreadHolder(ThreadingTestBase* test)
                 : m_context(test->m_context)
-                , m_readingThread(wrapUnique(new Thread("reading thread")))
-                , m_updatingThread(wrapUnique(new Thread("updating thread")))
+                , m_readingThread(adoptPtr(new Thread("reading thread")))
+                , m_updatingThread(adoptPtr(new Thread("updating thread")))
             {
                 m_context->registerThreadHolder(this);
             }
             ~ThreadHolder()
             {
                 m_context->unregisterThreadHolder();
             }
 
             WebThreadSupportingGC* readingThread() { return m_readingThread->thread(); }
             WebThreadSupportingGC* updatingThread() { return m_updatingThread->thread(); }
 
         private:
             RefPtr<Context> m_context;
-            std::unique_ptr<Thread> m_readingThread;
-            std::unique_ptr<Thread> m_updatingThread;
+            OwnPtr<Thread> m_readingThread;
+            OwnPtr<Thread> m_updatingThread;
         };
 
         class ReaderImpl final : public WebDataConsumerHandle::Reader {
             USING_FAST_MALLOC(ReaderImpl);
         public:
             ReaderImpl(const String& name, PassRefPtr<Context> context) : m_name(name.isolatedCopy()), m_context(context)
             {
                 m_context->recordAttach(m_name.isolatedCopy());
             }
             ~ReaderImpl() override { m_context->recordDetach(m_name.isolatedCopy()); }
 
             using Result = WebDataConsumerHandle::Result;
             using Flags = WebDataConsumerHandle::Flags;
             Result beginRead(const void**, Flags, size_t*) override { return WebDataConsumerHandle::ShouldWait; }
             Result endRead(size_t) override { return WebDataConsumerHandle::UnexpectedError; }
 
         private:
             const String m_name;
             RefPtr<Context> m_context;
         };
         class DataConsumerHandle final : public WebDataConsumerHandle {
             USING_FAST_MALLOC(DataConsumerHandle);
         public:
-            static std::unique_ptr<WebDataConsumerHandle> create(const String& name, PassRefPtr<Context> context)
+            static PassOwnPtr<WebDataConsumerHandle> create(const String& name, PassRefPtr<Context> context)
             {
-                return wrapUnique(new DataConsumerHandle(name, context));
+                return adoptPtr(new DataConsumerHandle(name, context));
             }
 
         private:
             DataConsumerHandle(const String& name, PassRefPtr<Context> context) : m_name(name.isolatedCopy()), m_context(context) { }
 
             Reader* obtainReaderInternal(Client*) { return new ReaderImpl(m_name, m_context); }
             const char* debugName() const override { return "ThreadingTestBase::DataConsumerHandle"; }
 
             const String m_name;
             RefPtr<Context> m_context;
@@ skipping 18 matching lines @@
         void postTaskToUpdatingThreadAndWait(const WebTraceLocation& location, std::unique_ptr<CrossThreadClosure> task)
         {
             postTaskToUpdatingThread(location,  std::move(task));
             m_waitableEvent->wait();
         }
     protected:
         ThreadingTestBase()
             : m_context(Context::create()) { }
 
         RefPtr<Context> m_context;
-        std::unique_ptr<WebDataConsumerHandle::Reader> m_reader;
-        std::unique_ptr<WaitableEvent> m_waitableEvent;
+        OwnPtr<WebDataConsumerHandle::Reader> m_reader;
+        OwnPtr<WaitableEvent> m_waitableEvent;
         NoopClient m_client;
     };
 
     class ThreadingHandleNotificationTest : public ThreadingTestBase, public WebDataConsumerHandle::Client {
     public:
         using Self = ThreadingHandleNotificationTest;
         static PassRefPtr<Self> create() { return adoptRef(new Self); }
 
-        void run(std::unique_ptr<WebDataConsumerHandle> handle)
+        void run(PassOwnPtr<WebDataConsumerHandle> handle)
         {
             ThreadHolder holder(this);
-            m_waitableEvent = wrapUnique(new WaitableEvent());
+            m_waitableEvent = adoptPtr(new WaitableEvent());
             m_handle = std::move(handle);
 
             postTaskToReadingThreadAndWait(BLINK_FROM_HERE, threadSafeBind(&Self::obtainReader, this));
         }
 
     private:
         ThreadingHandleNotificationTest() = default;
         void obtainReader()
         {
             m_reader = m_handle->obtainReader(this);
         }
         void didGetReadable() override
         {
             postTaskToReadingThread(BLINK_FROM_HERE, threadSafeBind(&Self::resetReader, this));
             postTaskToReadingThread(BLINK_FROM_HERE, threadSafeBind(&Self::signalDone, this));
         }
 
-        std::unique_ptr<WebDataConsumerHandle> m_handle;
+        OwnPtr<WebDataConsumerHandle> m_handle;
     };
 
     class ThreadingHandleNoNotificationTest : public ThreadingTestBase, public WebDataConsumerHandle::Client {
     public:
         using Self = ThreadingHandleNoNotificationTest;
         static PassRefPtr<Self> create() { return adoptRef(new Self); }
 
-        void run(std::unique_ptr<WebDataConsumerHandle> handle)
+        void run(PassOwnPtr<WebDataConsumerHandle> handle)
         {
             ThreadHolder holder(this);
-            m_waitableEvent = wrapUnique(new WaitableEvent());
+            m_waitableEvent = adoptPtr(new WaitableEvent());
             m_handle = std::move(handle);
 
             postTaskToReadingThreadAndWait(BLINK_FROM_HERE, threadSafeBind(&Self::obtainReader, this));
         }
 
     private:
         ThreadingHandleNoNotificationTest() = default;
         void obtainReader()
         {
             m_reader = m_handle->obtainReader(this);
             m_reader = nullptr;
             postTaskToReadingThread(BLINK_FROM_HERE, threadSafeBind(&Self::signalDone, this));
         }
         void didGetReadable() override
         {
             ASSERT_NOT_REACHED();
         }
 
-        std::unique_ptr<WebDataConsumerHandle> m_handle;
+        OwnPtr<WebDataConsumerHandle> m_handle;
     };
 
     class MockFetchDataConsumerHandle : public FetchDataConsumerHandle {
     public:
-        static std::unique_ptr<::testing::StrictMock<MockFetchDataConsumerHandle>> create() { return wrapUnique(new ::testing::StrictMock<MockFetchDataConsumerHandle>); }
+        static PassOwnPtr<::testing::StrictMock<MockFetchDataConsumerHandle>> create() { return adoptPtr(new ::testing::StrictMock<MockFetchDataConsumerHandle>); }
         MOCK_METHOD1(obtainReaderInternal, Reader*(Client*));
 
     private:
         const char* debugName() const override { return "MockFetchDataConsumerHandle"; }
     };
 
     class MockFetchDataConsumerReader : public FetchDataConsumerHandle::Reader {
     public:
-        static std::unique_ptr<::testing::StrictMock<MockFetchDataConsumerReader>> create() { return wrapUnique(new ::testing::StrictMock<MockFetchDataConsumerReader>); }
+        static PassOwnPtr<::testing::StrictMock<MockFetchDataConsumerReader>> create() { return adoptPtr(new ::testing::StrictMock<MockFetchDataConsumerReader>); }
 
         using Result = WebDataConsumerHandle::Result;
         using Flags = WebDataConsumerHandle::Flags;
         MOCK_METHOD4(read, Result(void*, size_t, Flags, size_t*));
         MOCK_METHOD3(beginRead, Result(const void**, Flags, size_t*));
         MOCK_METHOD1(endRead, Result(size_t));
         MOCK_METHOD1(drainAsBlobDataHandle, PassRefPtr<BlobDataHandle>(BlobSizePolicy));
 
         ~MockFetchDataConsumerReader() override
         {
@@ skipping 51 matching lines @@
 
     private:
         const Name m_name;
         Vector<char> m_body;
     };
 
     // ReplayingHandle stores commands via |add| and replays the stored commends when read.
     class ReplayingHandle final : public WebDataConsumerHandle {
         USING_FAST_MALLOC(ReplayingHandle);
     public:
-        static std::unique_ptr<ReplayingHandle> create() { return wrapUnique(new ReplayingHandle()); }
+        static PassOwnPtr<ReplayingHandle> create() { return adoptPtr(new ReplayingHandle()); }
         ~ReplayingHandle();
 
         // Add a command to this handle. This function must be called on the
         // creator thread. This function must be called BEFORE any reader is
         // obtained.
         void add(const Command&);
 
         class Context final : public ThreadSafeRefCounted<Context> {
         public:
             static PassRefPtr<Context> create() { return adoptRef(new Context); }
@@ skipping 16 matching lines @@
             void notify();
             void notifyInternal();
 
             Deque<Command> m_commands;
             size_t m_offset;
             WebThread* m_readerThread;
             Client* m_client;
             Result m_result;
             bool m_isHandleAttached;
             Mutex m_mutex;
-            std::unique_ptr<WaitableEvent> m_detached;
+            OwnPtr<WaitableEvent> m_detached;
         };
 
         Context* getContext() { return m_context.get(); }
 
     private:
         class ReaderImpl;
 
         ReplayingHandle();
         Reader* obtainReaderInternal(Client*) override;
         const char* debugName() const override { return "ReplayingHandle"; }
@@ skipping 12 matching lines @@
         const WebDataConsumerHandle::Result m_result;
         const Vector<char> m_data;
     };
 
     // HandleReader reads all data from the given WebDataConsumerHandle using
     // Reader::read on the thread on which it is created. When reading is done
     // or failed, it calls the given callback with the result.
     class HandleReader final : public WebDataConsumerHandle::Client {
         USING_FAST_MALLOC(HandleReader);
     public:
-        using OnFinishedReading = WTF::Function<void(std::unique_ptr<HandleReadResult>)>;
+        using OnFinishedReading = WTF::Function<void(PassOwnPtr<HandleReadResult>)>;
 
-        HandleReader(std::unique_ptr<WebDataConsumerHandle>, std::unique_ptr<OnFinishedReading>);
+        HandleReader(PassOwnPtr<WebDataConsumerHandle>, std::unique_ptr<OnFinishedReading>);
         void didGetReadable() override;
 
     private:
-        void runOnFinishedReading(std::unique_ptr<HandleReadResult>);
+        void runOnFinishedReading(PassOwnPtr<HandleReadResult>);
 
-        std::unique_ptr<WebDataConsumerHandle::Reader> m_reader;
+        OwnPtr<WebDataConsumerHandle::Reader> m_reader;
         std::unique_ptr<OnFinishedReading> m_onFinishedReading;
         Vector<char> m_data;
     };
 
     // HandleTwoPhaseReader does the same as HandleReader, but it uses
     // |beginRead| / |endRead| instead of |read|.
     class HandleTwoPhaseReader final : public WebDataConsumerHandle::Client {
         USING_FAST_MALLOC(HandleTwoPhaseReader);
     public:
-        using OnFinishedReading = WTF::Function<void(std::unique_ptr<HandleReadResult>)>;
+        using OnFinishedReading = WTF::Function<void(PassOwnPtr<HandleReadResult>)>;
 
-        HandleTwoPhaseReader(std::unique_ptr<WebDataConsumerHandle>, std::unique_ptr<OnFinishedReading>);
+        HandleTwoPhaseReader(PassOwnPtr<WebDataConsumerHandle>, std::unique_ptr<OnFinishedReading>);
         void didGetReadable() override;
 
     private:
-        void runOnFinishedReading(std::unique_ptr<HandleReadResult>);
+        void runOnFinishedReading(PassOwnPtr<HandleReadResult>);
 
-        std::unique_ptr<WebDataConsumerHandle::Reader> m_reader;
+        OwnPtr<WebDataConsumerHandle::Reader> m_reader;
         std::unique_ptr<OnFinishedReading> m_onFinishedReading;
         Vector<char> m_data;
     };
 
     // HandleReaderRunner<T> creates a dedicated thread and run T on the thread
     // where T is one of HandleReader and HandleTwophaseReader.
     template <typename T>
     class HandleReaderRunner final {
         STACK_ALLOCATED();
     public:
-        explicit HandleReaderRunner(std::unique_ptr<WebDataConsumerHandle> handle)
-            : m_thread(wrapUnique(new Thread("reading thread")))
-            , m_event(wrapUnique(new WaitableEvent()))
+        explicit HandleReaderRunner(PassOwnPtr<WebDataConsumerHandle> handle)
+            : m_thread(adoptPtr(new Thread("reading thread")))
+            , m_event(adoptPtr(new WaitableEvent()))
             , m_isDone(false)
         {
             m_thread->thread()->postTask(BLINK_FROM_HERE, threadSafeBind(&HandleReaderRunner::start, AllowCrossThreadAccess(this), passed(std::move(handle))));
         }
         ~HandleReaderRunner()
         {
             wait();
         }
 
-        std::unique_ptr<HandleReadResult> wait()
+        PassOwnPtr<HandleReadResult> wait()
         {
             if (m_isDone)
                 return nullptr;
             m_event->wait();
             m_isDone = true;
             return std::move(m_result);
         }
 
     private:
-        void start(std::unique_ptr<WebDataConsumerHandle> handle)
+        void start(PassOwnPtr<WebDataConsumerHandle> handle)
         {
-            m_handleReader = wrapUnique(new T(std::move(handle), WTF::bind<std::unique_ptr<HandleReadResult>>(&HandleReaderRunner::onFinished, this)));
+            m_handleReader = adoptPtr(new T(std::move(handle), bind<PassOwnPtr<HandleReadResult>>(&HandleReaderRunner::onFinished, this)));
         }
 
-        void onFinished(std::unique_ptr<HandleReadResult> result)
+        void onFinished(PassOwnPtr<HandleReadResult> result)
         {
             m_handleReader = nullptr;
             m_result = std::move(result);
             m_event->signal();
         }
 
-        std::unique_ptr<Thread> m_thread;
-        std::unique_ptr<WaitableEvent> m_event;
-        std::unique_ptr<HandleReadResult> m_result;
+        OwnPtr<Thread> m_thread;
+        OwnPtr<WaitableEvent> m_event;
+        OwnPtr<HandleReadResult> m_result;
         bool m_isDone;
 
-        std::unique_ptr<T> m_handleReader;
+        OwnPtr<T> m_handleReader;
     };
 };
 
 } // namespace blink
 
 #endif // DataConsumerHandleTestUtil_h