| Index: webkit/browser/fileapi/plugin_private_file_system_backend.cc
|
| diff --git a/webkit/browser/fileapi/plugin_private_file_system_backend.cc b/webkit/browser/fileapi/plugin_private_file_system_backend.cc
|
| index b4a3f8bf1e489a8cab174c4e37877baf0272cb26..2ea302f1726659cf502927a8c214b7f25b97309d 100644
|
| --- a/webkit/browser/fileapi/plugin_private_file_system_backend.cc
|
| +++ b/webkit/browser/fileapi/plugin_private_file_system_backend.cc
|
| @@ -66,18 +66,18 @@ const base::FilePath::CharType* kFileSystemDirectory =
|
| const base::FilePath::CharType* kPluginPrivateDirectory =
|
| FILE_PATH_LITERAL("Plugins");
|
|
|
| -base::PlatformFileError OpenFileSystemOnFileTaskRunner(
|
| +base::File::Error OpenFileSystemOnFileTaskRunner(
|
| ObfuscatedFileUtil* file_util,
|
| PluginPrivateFileSystemBackend::FileSystemIDToPluginMap* plugin_map,
|
| const GURL& origin_url,
|
| const std::string& filesystem_id,
|
| const std::string& plugin_id,
|
| OpenFileSystemMode mode) {
|
| - base::PlatformFileError error = base::PLATFORM_FILE_ERROR_FAILED;
|
| + base::File::Error error = base::File::FILE_ERROR_FAILED;
|
| const bool create = (mode == OPEN_FILE_SYSTEM_CREATE_IF_NONEXISTENT);
|
| file_util->GetDirectoryForOriginAndType(
|
| origin_url, plugin_id, create, &error);
|
| - if (error == base::PLATFORM_FILE_OK)
|
| + if (error == base::File::FILE_OK)
|
| plugin_map->RegisterFileSystem(filesystem_id, plugin_id);
|
| return error;
|
| }
|
| @@ -123,7 +123,7 @@ void PluginPrivateFileSystemBackend::OpenPrivateFileSystem(
|
| const StatusCallback& callback) {
|
| if (!CanHandleType(type) || file_system_options_.is_incognito()) {
|
| base::MessageLoopProxy::current()->PostTask(
|
| - FROM_HERE, base::Bind(callback, base::PLATFORM_FILE_ERROR_SECURITY));
|
| + FROM_HERE, base::Bind(callback, base::File::FILE_ERROR_SECURITY));
|
| return;
|
| }
|
|
|
| @@ -153,7 +153,7 @@ void PluginPrivateFileSystemBackend::OpenFileSystem(
|
| base::MessageLoopProxy::current()->PostTask(
|
| FROM_HERE,
|
| base::Bind(callback, GURL(), std::string(),
|
| - base::PLATFORM_FILE_ERROR_SECURITY));
|
| + base::File::FILE_ERROR_SECURITY));
|
| }
|
|
|
| AsyncFileUtil*
|
| @@ -164,16 +164,16 @@ PluginPrivateFileSystemBackend::GetAsyncFileUtil(FileSystemType type) {
|
| CopyOrMoveFileValidatorFactory*
|
| PluginPrivateFileSystemBackend::GetCopyOrMoveFileValidatorFactory(
|
| FileSystemType type,
|
| - base::PlatformFileError* error_code) {
|
| + base::File::Error* error_code) {
|
| DCHECK(error_code);
|
| - *error_code = base::PLATFORM_FILE_OK;
|
| + *error_code = base::File::FILE_OK;
|
| return NULL;
|
| }
|
|
|
| FileSystemOperation* PluginPrivateFileSystemBackend::CreateFileSystemOperation(
|
| const FileSystemURL& url,
|
| FileSystemContext* context,
|
| - base::PlatformFileError* error_code) const {
|
| + base::File::Error* error_code) const {
|
| scoped_ptr<FileSystemOperationContext> operation_context(
|
| new FileSystemOperationContext(context));
|
| return FileSystemOperation::Create(url, context, operation_context.Pass());
|
| @@ -200,19 +200,19 @@ FileSystemQuotaUtil* PluginPrivateFileSystemBackend::GetQuotaUtil() {
|
| return this;
|
| }
|
|
|
| -base::PlatformFileError
|
| +base::File::Error
|
| PluginPrivateFileSystemBackend::DeleteOriginDataOnFileTaskRunner(
|
| FileSystemContext* context,
|
| quota::QuotaManagerProxy* proxy,
|
| const GURL& origin_url,
|
| FileSystemType type) {
|
| if (!CanHandleType(type))
|
| - return base::PLATFORM_FILE_ERROR_SECURITY;
|
| + return base::File::FILE_ERROR_SECURITY;
|
| bool result = obfuscated_file_util()->DeleteDirectoryForOriginAndType(
|
| origin_url, std::string());
|
| if (result)
|
| - return base::PLATFORM_FILE_OK;
|
| - return base::PLATFORM_FILE_ERROR_FAILED;
|
| + return base::File::FILE_OK;
|
| + return base::File::FILE_ERROR_FAILED;
|
| }
|
|
|
| void PluginPrivateFileSystemBackend::GetOriginsForTypeOnFileTaskRunner(
|
|
|