Revert "Remove OwnPtr from Blink."

third_party/WebKit/public/platform/WebPrivateOwnPtr.h

 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
  * Copyright (C) 2013 Intel Corporation. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
@@ skipping 15 matching lines @@
 
 #ifndef WebPrivateOwnPtr_h
 #define WebPrivateOwnPtr_h
 
 #include "WebCommon.h"
 #include "WebNonCopyable.h"
 #include "base/logging.h"
 #include <cstddef>
 
 #if INSIDE_BLINK
-#include "wtf/PtrUtil.h"
-#include <memory>
+#include "wtf/PassOwnPtr.h"
 #endif
 
 namespace blink {
 
 // This class is an implementation detail of the WebKit API.  It exists
 // to help simplify the implementation of WebKit interfaces that merely
 // wrap a pointer to a WebCore class. It's similar to WebPrivatePtr, but it
 // wraps a naked pointer rather than a reference counted.
 // Note: you must call reset(0) on the implementation side in order to delete
 // the WebCore pointer.
 template <typename T>
 class WebPrivateOwnPtr : public WebNonCopyable {
 public:
     WebPrivateOwnPtr() : m_ptr(nullptr) {}
     WebPrivateOwnPtr(std::nullptr_t) : m_ptr(nullptr) {}
     ~WebPrivateOwnPtr() { DCHECK(!m_ptr); }
 
     explicit WebPrivateOwnPtr(T* ptr)
         : m_ptr(ptr)
     {
     }
 
     T* get() const { return m_ptr; }
 
 #if INSIDE_BLINK
     template <typename U>
-    WebPrivateOwnPtr(std::unique_ptr<U>, EnsurePtrConvertibleArgDecl(U, T));
+    WebPrivateOwnPtr(PassOwnPtr<U>, EnsurePtrConvertibleArgDecl(U, T));
 
     void reset(T* ptr)
     {
         delete m_ptr;
         m_ptr = ptr;
     }
 
-    void reset(std::unique_ptr<T> o)
+    void reset(PassOwnPtr<T> o)
     {
-        reset(o.release());
+        reset(o.leakPtr());
     }
 
-    std::unique_ptr<T> release()
+    PassOwnPtr<T> release()
     {
         T* ptr = m_ptr;
         m_ptr = nullptr;
-        return wrapUnique(ptr);
+        return adoptPtr(ptr);
     }
 
     T& operator*() const
     {
         DCHECK(m_ptr);
         return *m_ptr;
     }
 
     T* operator->() const
     {
         DCHECK(m_ptr);
         return m_ptr;
     }
 #endif // INSIDE_BLINK
 
 private:
     T* m_ptr;
 };
 
 #if INSIDE_BLINK
 template <typename T>
 template <typename U>
-inline WebPrivateOwnPtr<T>::WebPrivateOwnPtr(std::unique_ptr<U> o, EnsurePtrConvertibleArgDefn(U, T))
-    : m_ptr(o.release())
+inline WebPrivateOwnPtr<T>::WebPrivateOwnPtr(PassOwnPtr<U> o, EnsurePtrConvertibleArgDefn(U, T))
+    : m_ptr(o.leakPtr())
 {
     static_assert(!std::is_array<T>::value, "Pointers to array must never be converted");
 }
 #endif
 
 } // namespace blink
 
 #endif