Revert "Remove OwnPtr from Blink."

third_party/WebKit/Source/modules/fetch/FetchFormDataConsumerHandle.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/FetchFormDataConsumerHandle.h"
 
 #include "modules/fetch/DataConsumerHandleUtil.h"
 #include "modules/fetch/FetchBlobDataConsumerHandle.h"
-#include "wtf/PtrUtil.h"
 #include "wtf/ThreadingPrimitives.h"
 #include "wtf/Vector.h"
 #include "wtf/text/TextCodec.h"
 #include "wtf/text/TextEncoding.h"
 #include "wtf/text/WTFString.h"
-#include <memory>
+
 #include <utility>
 
 namespace blink {
 
 using Result = FetchDataConsumerHandle::Result;
 
 namespace {
 
 bool isSimple(const EncodedFormData* formData)
 {
     for (const auto& element : formData->elements()) {
         if (element.m_type != FormDataElement::data)
             return false;
     }
     return true;
 }
 
 } // namespace
 
 class FetchFormDataConsumerHandle::Context : public ThreadSafeRefCounted<Context> {
     WTF_MAKE_NONCOPYABLE(Context);
 public:
     virtual ~Context() {}
-    virtual std::unique_ptr<FetchDataConsumerHandle::Reader> obtainReader(Client*) = 0;
+    virtual PassOwnPtr<FetchDataConsumerHandle::Reader> obtainReader(Client*) = 0;
 
 protected:
     explicit Context() {}
 };
 
 class FetchFormDataConsumerHandle::SimpleContext final : public Context {
     class ReaderImpl;
 public:
     static PassRefPtr<SimpleContext> create(const String& body) { return adoptRef(new SimpleContext(body)); }
     static PassRefPtr<SimpleContext> create(const void* data, size_t size) { return adoptRef(new SimpleContext(data, size)); }
     static PassRefPtr<SimpleContext> create(PassRefPtr<EncodedFormData> body) { return adoptRef(new SimpleContext(body)); }
 
-    std::unique_ptr<Reader> obtainReader(Client* client) override
+    PassOwnPtr<Reader> obtainReader(Client* client) override
     {
         // For memory barrier.
         Mutex m;
         MutexLocker locker(m);
         return ReaderImpl::create(this, client);
     }
 
     PassRefPtr<BlobDataHandle> drainAsBlobDataHandle()
     {
         if (!m_formData)
             return nullptr;
         flatten();
-        std::unique_ptr<BlobData> blobData = BlobData::create();
+        OwnPtr<BlobData> blobData = BlobData::create();
         blobData->appendBytes(m_flattenFormData.data(), m_flattenFormData.size());
         m_flattenFormData.clear();
         auto length = blobData->length();
         return BlobDataHandle::create(std::move(blobData), length);
     }
 
     PassRefPtr<EncodedFormData> drainFormData()
     {
         ASSERT(!m_formData || m_formData->isSafeToSendToAnotherThread());
         return m_formData.release();
@@ skipping 39 matching lines @@
         RELEASE_ASSERT(read <= m_flattenFormData.size() - m_flattenFormDataOffset);
         m_flattenFormDataOffset += read;
 
         return WebDataConsumerHandle::Ok;
     }
 
 private:
     class ReaderImpl final : public FetchDataConsumerHandle::Reader {
         WTF_MAKE_NONCOPYABLE(ReaderImpl);
     public:
-        static std::unique_ptr<ReaderImpl> create(PassRefPtr<SimpleContext> context, Client* client) { return wrapUnique(new ReaderImpl(context, client)); }
+        static PassOwnPtr<ReaderImpl> create(PassRefPtr<SimpleContext> context, Client* client) { return adoptPtr(new ReaderImpl(context, client)); }
         Result read(void* data, size_t size, Flags flags, size_t* readSize) override
         {
             return m_context->read(data, size, flags, readSize);
         }
         Result beginRead(const void** buffer, Flags flags, size_t* available) override
         {
             return m_context->beginRead(buffer, flags, available);
         }
         Result endRead(size_t read) override
         {
@@ skipping 42 matching lines @@
 class FetchFormDataConsumerHandle::ComplexContext final : public Context {
     class ReaderImpl;
 public:
     static PassRefPtr<ComplexContext> create(ExecutionContext* executionContext,
         PassRefPtr<EncodedFormData> formData,
         FetchBlobDataConsumerHandle::LoaderFactory* factory)
     {
         return adoptRef(new ComplexContext(executionContext, formData, factory));
     }
 
-    std::unique_ptr<FetchFormDataConsumerHandle::Reader> obtainReader(Client* client) override
+    PassOwnPtr<FetchFormDataConsumerHandle::Reader> obtainReader(Client* client) override
     {
         // For memory barrier.
         Mutex m;
         MutexLocker locker(m);
         return ReaderImpl::create(this, client);
     }
 
 private:
     class ReaderImpl final : public FetchDataConsumerHandle::Reader {
         WTF_MAKE_NONCOPYABLE(ReaderImpl);
     public:
-        static std::unique_ptr<ReaderImpl> create(PassRefPtr<ComplexContext> context, Client* client) { return wrapUnique(new ReaderImpl(context, client)); }
+        static PassOwnPtr<ReaderImpl> create(PassRefPtr<ComplexContext> context, Client* client) { return adoptPtr(new ReaderImpl(context, client)); }
         Result read(void* data, size_t size, Flags flags, size_t* readSize) override
         {
             Result r = m_reader->read(data, size, flags, readSize);
             if (!(size == 0 && (r == Ok || r == ShouldWait))) {
                 m_context->drainFormData();
             }
             return r;
         }
         Result beginRead(const void** buffer, Flags flags, size_t* available) override
         {
@@ skipping 22 matching lines @@
                 // in fact not specified at FetchDataConsumerHandle level, but
                 // |m_context->m_handle| is a FetchBlobDataConsumerHandle.
                 ASSERT(handle);
             }
             return formData.release();
         }
     private:
         ReaderImpl(PassRefPtr<ComplexContext> context, Client* client) : m_context(context), m_reader(m_context->m_handle->obtainReader(client)) {}
 
         RefPtr<ComplexContext> m_context;
-        std::unique_ptr<FetchDataConsumerHandle::Reader> m_reader;
+        OwnPtr<FetchDataConsumerHandle::Reader> m_reader;
     };
 
     ComplexContext(ExecutionContext* executionContext, PassRefPtr<EncodedFormData> body, FetchBlobDataConsumerHandle::LoaderFactory* factory)
     {
-        std::unique_ptr<BlobData> blobData = BlobData::create();
+        OwnPtr<BlobData> blobData = BlobData::create();
         for (const auto& element : body->elements()) {
             switch (element.m_type) {
             case FormDataElement::data:
                 blobData->appendBytes(element.m_data.data(), element.m_data.size());
                 break;
             case FormDataElement::encodedFile:
                 blobData->appendFile(element.m_filename, element.m_fileStart, element.m_fileLength, element.m_expectedFileModificationTime);
                 break;
             case FormDataElement::encodedBlob:
                 if (element.m_optionalBlobDataHandle)
@@ skipping 19 matching lines @@
         // ref-counting.
         m_formData = body->deepCopy();
     }
     PassRefPtr<EncodedFormData> drainFormData()
     {
         ASSERT(!m_formData || m_formData->isSafeToSendToAnotherThread());
         return m_formData.release();
     }
 
     RefPtr<EncodedFormData> m_formData;
-    std::unique_ptr<FetchDataConsumerHandle> m_handle;
+    OwnPtr<FetchDataConsumerHandle> m_handle;
 };
 
-std::unique_ptr<FetchDataConsumerHandle> FetchFormDataConsumerHandle::create(const String& body)
+PassOwnPtr<FetchDataConsumerHandle> FetchFormDataConsumerHandle::create(const String& body)
 {
-    return wrapUnique(new FetchFormDataConsumerHandle(body));
+    return adoptPtr(new FetchFormDataConsumerHandle(body));
 }
-std::unique_ptr<FetchDataConsumerHandle> FetchFormDataConsumerHandle::create(DOMArrayBuffer* body)
+PassOwnPtr<FetchDataConsumerHandle> FetchFormDataConsumerHandle::create(DOMArrayBuffer* body)
 {
-    return wrapUnique(new FetchFormDataConsumerHandle(body->data(), body->byteLength()));
+    return adoptPtr(new FetchFormDataConsumerHandle(body->data(), body->byteLength()));
 }
-std::unique_ptr<FetchDataConsumerHandle> FetchFormDataConsumerHandle::create(DOMArrayBufferView* body)
+PassOwnPtr<FetchDataConsumerHandle> FetchFormDataConsumerHandle::create(DOMArrayBufferView* body)
 {
-    return wrapUnique(new FetchFormDataConsumerHandle(body->baseAddress(), body->byteLength()));
+    return adoptPtr(new FetchFormDataConsumerHandle(body->baseAddress(), body->byteLength()));
 }
-std::unique_ptr<FetchDataConsumerHandle> FetchFormDataConsumerHandle::create(const void* data, size_t size)
+PassOwnPtr<FetchDataConsumerHandle> FetchFormDataConsumerHandle::create(const void* data, size_t size)
 {
-    return wrapUnique(new FetchFormDataConsumerHandle(data, size));
+    return adoptPtr(new FetchFormDataConsumerHandle(data, size));
 }
-std::unique_ptr<FetchDataConsumerHandle> FetchFormDataConsumerHandle::create(ExecutionContext* executionContext, PassRefPtr<EncodedFormData> body)
+PassOwnPtr<FetchDataConsumerHandle> FetchFormDataConsumerHandle::create(ExecutionContext* executionContext, PassRefPtr<EncodedFormData> body)
 {
-    return wrapUnique(new FetchFormDataConsumerHandle(executionContext, body));
+    return adoptPtr(new FetchFormDataConsumerHandle(executionContext, body));
 }
-std::unique_ptr<FetchDataConsumerHandle> FetchFormDataConsumerHandle::createForTest(
+PassOwnPtr<FetchDataConsumerHandle> FetchFormDataConsumerHandle::createForTest(
     ExecutionContext* executionContext,
     PassRefPtr<EncodedFormData> body,
     FetchBlobDataConsumerHandle::LoaderFactory* loaderFactory)
 {
-    return wrapUnique(new FetchFormDataConsumerHandle(executionContext, body, loaderFactory));
+    return adoptPtr(new FetchFormDataConsumerHandle(executionContext, body, loaderFactory));
 }
 
 FetchFormDataConsumerHandle::FetchFormDataConsumerHandle(const String& body) : m_context(SimpleContext::create(body)) {}
 FetchFormDataConsumerHandle::FetchFormDataConsumerHandle(const void* data, size_t size) : m_context(SimpleContext::create(data, size)) {}
 FetchFormDataConsumerHandle::FetchFormDataConsumerHandle(ExecutionContext* executionContext,
     PassRefPtr<EncodedFormData> body,
     FetchBlobDataConsumerHandle::LoaderFactory* loaderFactory)
 {
     if (isSimple(body.get())) {
         m_context = SimpleContext::create(body);
     } else {
         m_context = ComplexContext::create(executionContext, body, loaderFactory);
     }
 }
 FetchFormDataConsumerHandle::~FetchFormDataConsumerHandle() {}
 
 FetchDataConsumerHandle::Reader* FetchFormDataConsumerHandle::obtainReaderInternal(Client* client)
 {
-    return m_context->obtainReader(client).release();
+    return m_context->obtainReader(client).leakPtr();
 }
 
 } // namespace blink