Revert "Remove OwnPtr from Blink."

third_party/WebKit/Source/platform/CrossThreadCopier.h

 /*
  * Copyright (C) 2009, 2010 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 17 matching lines @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef CrossThreadCopier_h
 #define CrossThreadCopier_h
 
 #include "platform/PlatformExport.h"
 #include "platform/heap/Handle.h"
 #include "wtf/Assertions.h"
 #include "wtf/Forward.h"
+#include "wtf/PassOwnPtr.h"
 #include "wtf/PassRefPtr.h"
 #include "wtf/RefPtr.h"
 #include "wtf/ThreadSafeRefCounted.h"
 #include "wtf/TypeTraits.h"
-#include <memory>
 
 class SkRefCnt;
 
 namespace WTF {
 
 template <typename T>
 class PassedWrapper;
 
 }
 
@@ skipping 74 matching lines @@
 template <>
 struct CrossThreadCopier<IntRect> : public CrossThreadCopierPassThrough<IntRect> {
     STATIC_ONLY(CrossThreadCopier);
 };
 
 template <>
 struct CrossThreadCopier<IntSize> : public CrossThreadCopierPassThrough<IntSize> {
     STATIC_ONLY(CrossThreadCopier);
 };
 
+template <typename T>
+struct CrossThreadCopier<PassOwnPtr<T>> {
+    STATIC_ONLY(CrossThreadCopier);
+    typedef PassOwnPtr<T> Type;
+    static Type copy(Type ownPtr)
+    {
+        return ownPtr;
+    }
+};
+
 template <typename T, typename Deleter>
 struct CrossThreadCopier<std::unique_ptr<T, Deleter>> {
     STATIC_ONLY(CrossThreadCopier);
     using Type = std::unique_ptr<T, Deleter>;
     static std::unique_ptr<T, Deleter> copy(std::unique_ptr<T, Deleter> pointer)
     {
         return pointer; // This is in fact a move.
     }
 };
 
@@ skipping 41 matching lines @@
 template <>
 struct CrossThreadCopier<ResourceError> {
     STATIC_ONLY(CrossThreadCopier);
     typedef ResourceError Type;
     PLATFORM_EXPORT static Type copy(const ResourceError&);
 };
 
 template <>
 struct CrossThreadCopier<ResourceRequest> {
     STATIC_ONLY(CrossThreadCopier);
-    typedef WTF::PassedWrapper<std::unique_ptr<CrossThreadResourceRequestData>> Type;
+    typedef WTF::PassedWrapper<PassOwnPtr<CrossThreadResourceRequestData>> Type;
     PLATFORM_EXPORT static Type copy(const ResourceRequest&);
 };
 
 template <>
 struct CrossThreadCopier<ResourceResponse> {
     STATIC_ONLY(CrossThreadCopier);
-    typedef WTF::PassedWrapper<std::unique_ptr<CrossThreadResourceResponseData>> Type;
+    typedef WTF::PassedWrapper<PassOwnPtr<CrossThreadResourceResponseData>> Type;
     PLATFORM_EXPORT static Type copy(const ResourceResponse&);
 };
 
 template <typename T>
 struct CrossThreadCopier<Member<T>> {
     STATIC_ONLY(CrossThreadCopier);
     static_assert(IsGarbageCollectedType<T>::value, "T must be a garbage-collected type.");
     typedef T* Type;
     static Type copy(const Member<T>& ptr)
     {
@@ skipping 33 matching lines @@
 AllowCrossThreadAccessWrapper<T*> AllowCrossThreadAccess(T* value)
 {
     static_assert(!IsGarbageCollectedType<T>::value, "Use wrapCrossThreadPersistent() instead for garbage-collected pointers");
     static_assert(!WTF::IsSubclassOfTemplate<T, ThreadSafeRefCounted>::value, "Use PassRefPtr<T> instead for ThreadSafeRefCounted");
     return AllowCrossThreadAccessWrapper<T*>(value);
 }
 
 } // namespace blink
 
 #endif // CrossThreadCopier_h