Revert "Remove OwnPtr from Blink."

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

Index: third_party/WebKit/Source/modules/fetch/FetchFormDataConsumerHandle.cpp
diff --git a/third_party/WebKit/Source/modules/fetch/FetchFormDataConsumerHandle.cpp b/third_party/WebKit/Source/modules/fetch/FetchFormDataConsumerHandle.cpp
index b20f7429effea9858350ed3030c3e69fd955e483..36bc17541129e8857e64f9cbd6ab2bf6f9ca396c 100644
--- a/third_party/WebKit/Source/modules/fetch/FetchFormDataConsumerHandle.cpp
+++ b/third_party/WebKit/Source/modules/fetch/FetchFormDataConsumerHandle.cpp
@@ -6,13 +6,12 @@
 
 #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 {
@@ -36,7 +35,7 @@ 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() {}
@@ -49,7 +48,7 @@ public:
     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;
@@ -62,7 +61,7 @@ public:
         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();
@@ -122,7 +121,7 @@ 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);
@@ -185,7 +184,7 @@ public:
         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;
@@ -197,7 +196,7 @@ 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);
@@ -240,12 +239,12 @@ 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:
@@ -285,35 +284,35 @@ private:
     }
 
     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)) {}
@@ -332,7 +331,7 @@ FetchFormDataConsumerHandle::~FetchFormDataConsumerHandle() {}
 
 FetchDataConsumerHandle::Reader* FetchFormDataConsumerHandle::obtainReaderInternal(Client* client)
 {
-    return m_context->obtainReader(client).release();
+    return m_context->obtainReader(client).leakPtr();
 }
 
 } // namespace blink