Revert "Remove OwnPtr from Blink."

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

Index: third_party/WebKit/Source/modules/fetch/FetchDataLoader.cpp
diff --git a/third_party/WebKit/Source/modules/fetch/FetchDataLoader.cpp b/third_party/WebKit/Source/modules/fetch/FetchDataLoader.cpp
index abf39003580d577ffa2166c50f44b87151ce5324..ea21ae5816a72697f71c7c486bd2921d4b63947b 100644
--- a/third_party/WebKit/Source/modules/fetch/FetchDataLoader.cpp
+++ b/third_party/WebKit/Source/modules/fetch/FetchDataLoader.cpp
@@ -5,11 +5,9 @@
 #include "modules/fetch/FetchDataLoader.h"
 
 #include "core/html/parser/TextResourceDecoder.h"
-#include "wtf/PtrUtil.h"
 #include "wtf/text/StringBuilder.h"
 #include "wtf/text/WTFString.h"
 #include "wtf/typed_arrays/ArrayBufferBuilder.h"
-#include <memory>
 
 namespace blink {
 
@@ -103,11 +101,11 @@ private:
         m_client.clear();
     }
 
-    std::unique_ptr<FetchDataConsumerHandle::Reader> m_reader;
+    OwnPtr<FetchDataConsumerHandle::Reader> m_reader;
     Member<FetchDataLoader::Client> m_client;
 
     String m_mimeType;
-    std::unique_ptr<BlobData> m_blobData;
+    OwnPtr<BlobData> m_blobData;
 };
 
 class FetchDataLoaderAsArrayBuffer
@@ -130,7 +128,7 @@ protected:
         ASSERT(!m_rawData);
         ASSERT(!m_reader);
         m_client = client;
-        m_rawData = wrapUnique(new ArrayBufferBuilder());
+        m_rawData = adoptPtr(new ArrayBufferBuilder());
         m_reader = handle->obtainReader(this);
     }
 
@@ -193,10 +191,10 @@ protected:
         m_client.clear();
     }
 
-    std::unique_ptr<FetchDataConsumerHandle::Reader> m_reader;
+    OwnPtr<FetchDataConsumerHandle::Reader> m_reader;
     Member<FetchDataLoader::Client> m_client;
 
-    std::unique_ptr<ArrayBufferBuilder> m_rawData;
+    OwnPtr<ArrayBufferBuilder> m_rawData;
 };
 
 class FetchDataLoaderAsString
@@ -279,10 +277,10 @@ protected:
         m_client.clear();
     }
 
-    std::unique_ptr<FetchDataConsumerHandle::Reader> m_reader;
+    OwnPtr<FetchDataConsumerHandle::Reader> m_reader;
     Member<FetchDataLoader::Client> m_client;
 
-    std::unique_ptr<TextResourceDecoder> m_decoder;
+    OwnPtr<TextResourceDecoder> m_decoder;
     StringBuilder m_builder;
 };
 
@@ -371,7 +369,7 @@ protected:
         m_outStream.clear();
     }
 
-    std::unique_ptr<FetchDataConsumerHandle::Reader> m_reader;
+    OwnPtr<FetchDataConsumerHandle::Reader> m_reader;
     Member<FetchDataLoader::Client> m_client;
 
     Member<Stream> m_outStream;