| Index: webkit/browser/fileapi/file_system_context.h
|
| diff --git a/webkit/browser/fileapi/file_system_context.h b/webkit/browser/fileapi/file_system_context.h
|
| index 9f81bba0c4e3db92bf899e7eadc845d9c3e7b765..04c9fa62368e22e2b7b472237c899f8d40fc6202 100644
|
| --- a/webkit/browser/fileapi/file_system_context.h
|
| +++ b/webkit/browser/fileapi/file_system_context.h
|
| @@ -10,10 +10,10 @@
|
| #include <vector>
|
|
|
| #include "base/callback.h"
|
| +#include "base/files/file.h"
|
| #include "base/memory/ref_counted.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/memory/scoped_vector.h"
|
| -#include "base/platform_file.h"
|
| #include "base/sequenced_task_runner_helpers.h"
|
| #include "webkit/browser/fileapi/file_system_url.h"
|
| #include "webkit/browser/fileapi/open_file_system_mode.h"
|
| @@ -134,7 +134,7 @@ class WEBKIT_STORAGE_BROWSER_EXPORT FileSystemContext
|
| // |type|. If |error_code| is PLATFORM_FILE_OK and the result is NULL,
|
| // then no validator is required.
|
| CopyOrMoveFileValidatorFactory* GetCopyOrMoveFileValidatorFactory(
|
| - FileSystemType type, base::PlatformFileError* error_code) const;
|
| + FileSystemType type, base::File::Error* error_code) const;
|
|
|
| // Returns the file system backend instance for the given |type|.
|
| // This may return NULL if it is given an invalid or unsupported filesystem
|
| @@ -163,17 +163,17 @@ class WEBKIT_STORAGE_BROWSER_EXPORT FileSystemContext
|
| // Used for OpenFileSystem.
|
| typedef base::Callback<void(const GURL& root,
|
| const std::string& name,
|
| - base::PlatformFileError result)>
|
| + base::File::Error result)>
|
| OpenFileSystemCallback;
|
|
|
| // Used for ResolveURL.
|
| - typedef base::Callback<void(base::PlatformFileError result,
|
| + typedef base::Callback<void(base::File::Error result,
|
| const FileSystemInfo& info,
|
| const base::FilePath& file_path,
|
| bool is_directory)> ResolveURLCallback;
|
|
|
| // Used for DeleteFileSystem and OpenPluginPrivateFileSystem.
|
| - typedef base::Callback<void(base::PlatformFileError result)> StatusCallback;
|
| + typedef base::Callback<void(base::File::Error result)> StatusCallback;
|
|
|
| // Opens the filesystem for the given |origin_url| and |type|, and dispatches
|
| // |callback| on completion.
|
| @@ -296,7 +296,7 @@ class WEBKIT_STORAGE_BROWSER_EXPORT FileSystemContext
|
| // Called by FileSystemOperationRunner.
|
| FileSystemOperation* CreateFileSystemOperation(
|
| const FileSystemURL& url,
|
| - base::PlatformFileError* error_code);
|
| + base::File::Error* error_code);
|
|
|
| // For non-cracked isolated and external mount points, returns a FileSystemURL
|
| // created by cracking |url|. The url is cracked using MountPoints registered
|
| @@ -316,7 +316,7 @@ class WEBKIT_STORAGE_BROWSER_EXPORT FileSystemContext
|
| const ResolveURLCallback& callback,
|
| const GURL& filesystem_root,
|
| const std::string& filesystem_name,
|
| - base::PlatformFileError error);
|
| + base::File::Error error);
|
|
|
| // Returns a FileSystemBackend, used only by test code.
|
| SandboxFileSystemBackend* sandbox_backend() const {
|
|
|