Revert "Remove OwnPtr from Blink."

third_party/WebKit/Source/modules/filesystem/LocalFileSystem.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 24 matching lines @@
 #include "core/dom/ExecutionContextTask.h"
 #include "core/fileapi/FileError.h"
 #include "core/frame/LocalFrame.h"
 #include "core/workers/WorkerGlobalScope.h"
 #include "modules/filesystem/FileSystemClient.h"
 #include "platform/AsyncFileSystemCallbacks.h"
 #include "platform/ContentSettingCallbacks.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebFileSystem.h"
 #include "wtf/Functional.h"
-#include <memory>
 
 namespace blink {
 
 namespace {
 
-void reportFailure(std::unique_ptr<AsyncFileSystemCallbacks> callbacks, FileError::ErrorCode error)
+void reportFailure(PassOwnPtr<AsyncFileSystemCallbacks> callbacks, FileError::ErrorCode error)
 {
     callbacks->didFail(error);
 }
 
 } // namespace
 
 class CallbackWrapper final : public GarbageCollectedFinalized<CallbackWrapper> {
 public:
-    CallbackWrapper(std::unique_ptr<AsyncFileSystemCallbacks> c)
+    CallbackWrapper(PassOwnPtr<AsyncFileSystemCallbacks> c)
         : m_callbacks(std::move(c))
     {
     }
     virtual ~CallbackWrapper() { }
-    std::unique_ptr<AsyncFileSystemCallbacks> release()
+    PassOwnPtr<AsyncFileSystemCallbacks> release()
     {
         return std::move(m_callbacks);
     }
 
     DEFINE_INLINE_TRACE() { }
 
 private:
-    std::unique_ptr<AsyncFileSystemCallbacks> m_callbacks;
+    OwnPtr<AsyncFileSystemCallbacks> m_callbacks;
 };
 
-LocalFileSystem* LocalFileSystem::create(std::unique_ptr<FileSystemClient> client)
+LocalFileSystem* LocalFileSystem::create(PassOwnPtr<FileSystemClient> client)
 {
     return new LocalFileSystem(std::move(client));
 }
 
 LocalFileSystem::~LocalFileSystem()
 {
 }
 
-void LocalFileSystem::resolveURL(ExecutionContext* context, const KURL& fileSystemURL, std::unique_ptr<AsyncFileSystemCallbacks> callbacks)
+void LocalFileSystem::resolveURL(ExecutionContext* context, const KURL& fileSystemURL, PassOwnPtr<AsyncFileSystemCallbacks> callbacks)
 {
     CallbackWrapper* wrapper = new CallbackWrapper(std::move(callbacks));
     requestFileSystemAccessInternal(context,
         bind(&LocalFileSystem::resolveURLInternal, this, context, fileSystemURL, wrapper),
         bind(&LocalFileSystem::fileSystemNotAllowedInternal, this, context, wrapper));
 }
 
-void LocalFileSystem::requestFileSystem(ExecutionContext* context, FileSystemType type, long long size, std::unique_ptr<AsyncFileSystemCallbacks> callbacks)
+void LocalFileSystem::requestFileSystem(ExecutionContext* context, FileSystemType type, long long size, PassOwnPtr<AsyncFileSystemCallbacks> callbacks)
 {
     CallbackWrapper* wrapper = new CallbackWrapper(std::move(callbacks));
     requestFileSystemAccessInternal(context,
         bind(&LocalFileSystem::fileSystemAllowedInternal, this, context, type, wrapper),
         bind(&LocalFileSystem::fileSystemNotAllowedInternal, this, context, wrapper));
 }
 
-void LocalFileSystem::deleteFileSystem(ExecutionContext* context, FileSystemType type, std::unique_ptr<AsyncFileSystemCallbacks> callbacks)
+void LocalFileSystem::deleteFileSystem(ExecutionContext* context, FileSystemType type, PassOwnPtr<AsyncFileSystemCallbacks> callbacks)
 {
     ASSERT(context);
     ASSERT_WITH_SECURITY_IMPLICATION(context->isDocument());
 
     CallbackWrapper* wrapper = new CallbackWrapper(std::move(callbacks));
     requestFileSystemAccessInternal(context,
         bind(&LocalFileSystem::deleteFileSystemInternal, this, context, type, wrapper),
         bind(&LocalFileSystem::fileSystemNotAllowedInternal, this, context, wrapper));
 }
 
@@ skipping 71 matching lines @@
 {
     WebFileSystem* fileSystem = getFileSystem();
     if (!fileSystem) {
         fileSystemNotAvailable(context, callbacks);
         return;
     }
     KURL storagePartition = KURL(KURL(), context->getSecurityOrigin()->toString());
     fileSystem->deleteFileSystem(storagePartition, static_cast<WebFileSystemType>(type), callbacks->release());
 }
 
-LocalFileSystem::LocalFileSystem(std::unique_ptr<FileSystemClient> client)
+LocalFileSystem::LocalFileSystem(PassOwnPtr<FileSystemClient> client)
     : m_client(std::move(client))
 {
 }
 
 const char* LocalFileSystem::supplementName()
 {
     return "LocalFileSystem";
 }
 
 LocalFileSystem* LocalFileSystem::from(ExecutionContext& context)
 {
     if (context.isDocument())
         return static_cast<LocalFileSystem*>(Supplement<LocalFrame>::from(toDocument(context).frame(), supplementName()));
 
     WorkerClients* clients = toWorkerGlobalScope(context).clients();
     ASSERT(clients);
     return static_cast<LocalFileSystem*>(Supplement<WorkerClients>::from(clients, supplementName()));
 }
 
-void provideLocalFileSystemTo(LocalFrame& frame, std::unique_ptr<FileSystemClient> client)
+void provideLocalFileSystemTo(LocalFrame& frame, PassOwnPtr<FileSystemClient> client)
 {
     frame.provideSupplement(LocalFileSystem::supplementName(), LocalFileSystem::create(std::move(client)));
 }
 
-void provideLocalFileSystemToWorker(WorkerClients* clients, std::unique_ptr<FileSystemClient> client)
+void provideLocalFileSystemToWorker(WorkerClients* clients, PassOwnPtr<FileSystemClient> client)
 {
     clients->provideSupplement(LocalFileSystem::supplementName(), LocalFileSystem::create(std::move(client)));
 }
 
 } // namespace blink