Revert "Remove OwnPtr from Blink."

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

Index: third_party/WebKit/Source/modules/fetch/CompositeDataConsumerHandle.h
diff --git a/third_party/WebKit/Source/modules/fetch/CompositeDataConsumerHandle.h b/third_party/WebKit/Source/modules/fetch/CompositeDataConsumerHandle.h
index e2a95d2d87bb10a4d4e41d5b106daea6b406b34a..cc41704dbc2824a40ba7dfe98fa7ba6bf7fc912a 100644
--- a/third_party/WebKit/Source/modules/fetch/CompositeDataConsumerHandle.h
+++ b/third_party/WebKit/Source/modules/fetch/CompositeDataConsumerHandle.h
@@ -9,9 +9,9 @@
 #include "platform/heap/Handle.h"
 #include "public/platform/WebDataConsumerHandle.h"
 #include "wtf/Allocator.h"
-#include "wtf/PtrUtil.h"
+#include "wtf/OwnPtr.h"
+#include "wtf/PassOwnPtr.h"
 #include "wtf/RefPtr.h"
-#include <memory>
 
 namespace blink {
 
@@ -32,7 +32,7 @@ public:
         ~Updater();
 
         // |handle| must not be null and must not be locked.
-        void update(std::unique_ptr<WebDataConsumerHandle> /* handle */);
+        void update(PassOwnPtr<WebDataConsumerHandle> /* handle */);
         DEFINE_INLINE_TRACE() { }
 
     private:
@@ -46,11 +46,11 @@ public:
     // associated updater will be bound to the calling thread.
     // |handle| must not be null and must not be locked.
     template<typename T>
-    static std::unique_ptr<WebDataConsumerHandle> create(std::unique_ptr<WebDataConsumerHandle> handle, T* updater)
+    static PassOwnPtr<WebDataConsumerHandle> create(PassOwnPtr<WebDataConsumerHandle> handle, T* updater)
     {
         ASSERT(handle);
         Updater* u = nullptr;
-        std::unique_ptr<CompositeDataConsumerHandle> p = wrapUnique(new CompositeDataConsumerHandle(std::move(handle), &u));
+        OwnPtr<CompositeDataConsumerHandle> p = adoptPtr(new CompositeDataConsumerHandle(std::move(handle), &u));
         *updater = u;
         return std::move(p);
     }
@@ -62,7 +62,7 @@ private:
 
     const char* debugName() const override { return "CompositeDataConsumerHandle"; }
 
-    CompositeDataConsumerHandle(std::unique_ptr<WebDataConsumerHandle>, Updater**);
+    CompositeDataConsumerHandle(PassOwnPtr<WebDataConsumerHandle>, Updater**);
 
     RefPtr<Context> m_context;
 };