| Index: chrome/browser/chromeos/drive/fileapi/async_file_util.h
|
| diff --git a/chrome/browser/chromeos/drive/fileapi/async_file_util.h b/chrome/browser/chromeos/drive/fileapi/async_file_util.h
|
| index 8b0f18838ce586addc80bc2aa5ad816763c23620..0b236f21885d7451dba939fac637746d7364737c 100644
|
| --- a/chrome/browser/chromeos/drive/fileapi/async_file_util.h
|
| +++ b/chrome/browser/chromeos/drive/fileapi/async_file_util.h
|
| @@ -7,9 +7,10 @@
|
|
|
| #include <stdint.h>
|
|
|
| +#include <memory>
|
| +
|
| #include "base/callback.h"
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "storage/browser/fileapi/async_file_util.h"
|
|
|
| namespace drive {
|
| @@ -25,62 +26,69 @@ class AsyncFileUtil : public storage::AsyncFileUtil {
|
| ~AsyncFileUtil() override;
|
|
|
| // storage::AsyncFileUtil overrides.
|
| - void CreateOrOpen(scoped_ptr<storage::FileSystemOperationContext> context,
|
| - const storage::FileSystemURL& url,
|
| - int file_flags,
|
| - const CreateOrOpenCallback& callback) override;
|
| - void EnsureFileExists(scoped_ptr<storage::FileSystemOperationContext> context,
|
| - const storage::FileSystemURL& url,
|
| - const EnsureFileExistsCallback& callback) override;
|
| - void CreateDirectory(scoped_ptr<storage::FileSystemOperationContext> context,
|
| - const storage::FileSystemURL& url,
|
| - bool exclusive,
|
| - bool recursive,
|
| - const StatusCallback& callback) override;
|
| - void GetFileInfo(scoped_ptr<storage::FileSystemOperationContext> context,
|
| + void CreateOrOpen(
|
| + std::unique_ptr<storage::FileSystemOperationContext> context,
|
| + const storage::FileSystemURL& url,
|
| + int file_flags,
|
| + const CreateOrOpenCallback& callback) override;
|
| + void EnsureFileExists(
|
| + std::unique_ptr<storage::FileSystemOperationContext> context,
|
| + const storage::FileSystemURL& url,
|
| + const EnsureFileExistsCallback& callback) override;
|
| + void CreateDirectory(
|
| + std::unique_ptr<storage::FileSystemOperationContext> context,
|
| + const storage::FileSystemURL& url,
|
| + bool exclusive,
|
| + bool recursive,
|
| + const StatusCallback& callback) override;
|
| + void GetFileInfo(std::unique_ptr<storage::FileSystemOperationContext> context,
|
| const storage::FileSystemURL& url,
|
| int fields,
|
| const GetFileInfoCallback& callback) override;
|
| - void ReadDirectory(scoped_ptr<storage::FileSystemOperationContext> context,
|
| - const storage::FileSystemURL& url,
|
| - const ReadDirectoryCallback& callback) override;
|
| - void Touch(scoped_ptr<storage::FileSystemOperationContext> context,
|
| + void ReadDirectory(
|
| + std::unique_ptr<storage::FileSystemOperationContext> context,
|
| + const storage::FileSystemURL& url,
|
| + const ReadDirectoryCallback& callback) override;
|
| + void Touch(std::unique_ptr<storage::FileSystemOperationContext> context,
|
| const storage::FileSystemURL& url,
|
| const base::Time& last_access_time,
|
| const base::Time& last_modified_time,
|
| const StatusCallback& callback) override;
|
| - void Truncate(scoped_ptr<storage::FileSystemOperationContext> context,
|
| + void Truncate(std::unique_ptr<storage::FileSystemOperationContext> context,
|
| const storage::FileSystemURL& url,
|
| int64_t length,
|
| const StatusCallback& callback) override;
|
| - void CopyFileLocal(scoped_ptr<storage::FileSystemOperationContext> context,
|
| - const storage::FileSystemURL& src_url,
|
| - const storage::FileSystemURL& dest_url,
|
| - CopyOrMoveOption option,
|
| - const CopyFileProgressCallback& progress_callback,
|
| - const StatusCallback& callback) override;
|
| - void MoveFileLocal(scoped_ptr<storage::FileSystemOperationContext> context,
|
| - const storage::FileSystemURL& src_url,
|
| - const storage::FileSystemURL& dest_url,
|
| - CopyOrMoveOption option,
|
| - const StatusCallback& callback) override;
|
| + void CopyFileLocal(
|
| + std::unique_ptr<storage::FileSystemOperationContext> context,
|
| + const storage::FileSystemURL& src_url,
|
| + const storage::FileSystemURL& dest_url,
|
| + CopyOrMoveOption option,
|
| + const CopyFileProgressCallback& progress_callback,
|
| + const StatusCallback& callback) override;
|
| + void MoveFileLocal(
|
| + std::unique_ptr<storage::FileSystemOperationContext> context,
|
| + const storage::FileSystemURL& src_url,
|
| + const storage::FileSystemURL& dest_url,
|
| + CopyOrMoveOption option,
|
| + const StatusCallback& callback) override;
|
| void CopyInForeignFile(
|
| - scoped_ptr<storage::FileSystemOperationContext> context,
|
| + std::unique_ptr<storage::FileSystemOperationContext> context,
|
| const base::FilePath& src_file_path,
|
| const storage::FileSystemURL& dest_url,
|
| const StatusCallback& callback) override;
|
| - void DeleteFile(scoped_ptr<storage::FileSystemOperationContext> context,
|
| + void DeleteFile(std::unique_ptr<storage::FileSystemOperationContext> context,
|
| const storage::FileSystemURL& url,
|
| const StatusCallback& callback) override;
|
| - void DeleteDirectory(scoped_ptr<storage::FileSystemOperationContext> context,
|
| - const storage::FileSystemURL& url,
|
| - const StatusCallback& callback) override;
|
| + void DeleteDirectory(
|
| + std::unique_ptr<storage::FileSystemOperationContext> context,
|
| + const storage::FileSystemURL& url,
|
| + const StatusCallback& callback) override;
|
| void DeleteRecursively(
|
| - scoped_ptr<storage::FileSystemOperationContext> context,
|
| + std::unique_ptr<storage::FileSystemOperationContext> context,
|
| const storage::FileSystemURL& url,
|
| const StatusCallback& callback) override;
|
| void CreateSnapshotFile(
|
| - scoped_ptr<storage::FileSystemOperationContext> context,
|
| + std::unique_ptr<storage::FileSystemOperationContext> context,
|
| const storage::FileSystemURL& url,
|
| const CreateSnapshotFileCallback& callback) override;
|
|
|
|
|