Revert "Remove OwnPtr from Blink."

third_party/WebKit/Source/platform/exported/WebFileSystemCallbacks.cpp

 /*
  * Copyright (C) 2013 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 19 matching lines @@
 
 #include "public/platform/WebFileSystemCallbacks.h"
 
 #include "platform/AsyncFileSystemCallbacks.h"
 #include "platform/FileMetadata.h"
 #include "public/platform/WebFileInfo.h"
 #include "public/platform/WebFileSystem.h"
 #include "public/platform/WebFileSystemEntry.h"
 #include "public/platform/WebFileWriter.h"
 #include "public/platform/WebString.h"
+#include "wtf/PassOwnPtr.h"
 #include "wtf/PassRefPtr.h"
-#include "wtf/PtrUtil.h"
 #include "wtf/RefCounted.h"
-#include <memory>
 
 namespace blink {
 
 class WebFileSystemCallbacksPrivate : public RefCounted<WebFileSystemCallbacksPrivate> {
 public:
-    static PassRefPtr<WebFileSystemCallbacksPrivate> create(std::unique_ptr<AsyncFileSystemCallbacks> callbacks)
+    static PassRefPtr<WebFileSystemCallbacksPrivate> create(PassOwnPtr<AsyncFileSystemCallbacks> callbacks)
     {
         return adoptRef(new WebFileSystemCallbacksPrivate(std::move(callbacks)));
     }
 
     AsyncFileSystemCallbacks* callbacks() { return m_callbacks.get(); }
 
 private:
-    WebFileSystemCallbacksPrivate(std::unique_ptr<AsyncFileSystemCallbacks> callbacks) : m_callbacks(std::move(callbacks)) { }
-    std::unique_ptr<AsyncFileSystemCallbacks> m_callbacks;
+    WebFileSystemCallbacksPrivate(PassOwnPtr<AsyncFileSystemCallbacks> callbacks) : m_callbacks(std::move(callbacks)) { }
+    OwnPtr<AsyncFileSystemCallbacks> m_callbacks;
 };
 
-WebFileSystemCallbacks::WebFileSystemCallbacks(std::unique_ptr<AsyncFileSystemCallbacks>&& callbacks)
+WebFileSystemCallbacks::WebFileSystemCallbacks(PassOwnPtr<AsyncFileSystemCallbacks>&& callbacks)
 {
     m_private = WebFileSystemCallbacksPrivate::create(std::move(callbacks));
 }
 
 void WebFileSystemCallbacks::reset()
 {
     m_private.reset();
 }
 
 void WebFileSystemCallbacks::assign(const WebFileSystemCallbacks& other)
@@ skipping 18 matching lines @@
     fileMetadata.platformPath = webFileInfo.platformPath;
     m_private->callbacks()->didReadMetadata(fileMetadata);
     m_private.reset();
 }
 
 void WebFileSystemCallbacks::didCreateSnapshotFile(const WebFileInfo& webFileInfo)
 {
     ASSERT(!m_private.isNull());
     // It's important to create a BlobDataHandle that refers to the platform file path prior
     // to return from this method so the underlying file will not be deleted.
-    std::unique_ptr<BlobData> blobData = BlobData::create();
+    OwnPtr<BlobData> blobData = BlobData::create();
     blobData->appendFile(webFileInfo.platformPath, 0, webFileInfo.length, invalidFileTime());
     RefPtr<BlobDataHandle> snapshotBlob = BlobDataHandle::create(std::move(blobData), webFileInfo.length);
 
     FileMetadata fileMetadata;
     fileMetadata.modificationTime = webFileInfo.modificationTime;
     fileMetadata.length = webFileInfo.length;
     fileMetadata.type = static_cast<FileMetadata::Type>(webFileInfo.type);
     fileMetadata.platformPath = webFileInfo.platformPath;
     m_private->callbacks()->didCreateSnapshotFile(fileMetadata, snapshotBlob);
     m_private.reset();
@@ skipping 18 matching lines @@
 void WebFileSystemCallbacks::didResolveURL(const WebString& name, const WebURL& rootURL, WebFileSystemType type, const WebString& filePath, bool isDirectory)
 {
     ASSERT(!m_private.isNull());
     m_private->callbacks()->didResolveURL(name, rootURL, static_cast<FileSystemType>(type), filePath, isDirectory);
     m_private.reset();
 }
 
 void WebFileSystemCallbacks::didCreateFileWriter(WebFileWriter* webFileWriter, long long length)
 {
     ASSERT(!m_private.isNull());
-    m_private->callbacks()->didCreateFileWriter(wrapUnique(webFileWriter), length);
+    m_private->callbacks()->didCreateFileWriter(adoptPtr(webFileWriter), length);
     m_private.reset();
 }
 
 void WebFileSystemCallbacks::didFail(WebFileError error)
 {
     ASSERT(!m_private.isNull());
     m_private->callbacks()->didFail(error);
     m_private.reset();
 }
 
 bool WebFileSystemCallbacks::shouldBlockUntilCompletion() const
 {
     ASSERT(!m_private.isNull());
     return m_private->callbacks()->shouldBlockUntilCompletion();
 }
 
 } // namespace blink