| Index: chrome/browser/chromeos/file_system_provider/fileapi/provider_async_file_util.cc
|
| diff --git a/chrome/browser/chromeos/file_system_provider/fileapi/provider_async_file_util.cc b/chrome/browser/chromeos/file_system_provider/fileapi/provider_async_file_util.cc
|
| index 6613336aae94a60726f655923ccebd16a9adaacb..e006ad0b30b25b6c0899baff7112d7cbceccdcae 100644
|
| --- a/chrome/browser/chromeos/file_system_provider/fileapi/provider_async_file_util.cc
|
| +++ b/chrome/browser/chromeos/file_system_provider/fileapi/provider_async_file_util.cc
|
| @@ -29,7 +29,7 @@ void GetFileInfoOnUIThread(
|
| const fileapi::AsyncFileUtil::GetFileInfoCallback& callback) {
|
| util::FileSystemURLParser parser(url);
|
| if (!parser.Parse()) {
|
| - callback.Run(base::File::FILE_ERROR_NOT_FOUND, base::File::Info());
|
| + callback.Run(base::File::FILE_ERROR_INVALID_OPERATION, base::File::Info());
|
| return;
|
| }
|
|
|
| @@ -51,7 +51,7 @@ void ReadDirectoryOnUIThread(
|
| const fileapi::AsyncFileUtil::ReadDirectoryCallback& callback) {
|
| util::FileSystemURLParser parser(url);
|
| if (!parser.Parse()) {
|
| - callback.Run(base::File::FILE_ERROR_NOT_FOUND,
|
| + callback.Run(base::File::FILE_ERROR_INVALID_OPERATION,
|
| fileapi::AsyncFileUtil::EntryList(),
|
| false /* has_more */);
|
| return;
|
| @@ -87,12 +87,14 @@ void ProviderAsyncFileUtil::CreateOrOpen(
|
| (file_flags & base::File::FLAG_OPEN_ALWAYS) ||
|
| (file_flags & base::File::FLAG_CREATE_ALWAYS) ||
|
| (file_flags & base::File::FLAG_OPEN_TRUNCATED)) {
|
| - callback.Run(base::File(base::File::FILE_ERROR_SECURITY), base::Closure());
|
| + callback.Run(base::File(base::File::FILE_ERROR_ACCESS_DENIED),
|
| + base::Closure());
|
| return;
|
| }
|
|
|
| NOTIMPLEMENTED();
|
| - callback.Run(base::File(base::File::FILE_ERROR_NOT_FOUND), base::Closure());
|
| + callback.Run(base::File(base::File::FILE_ERROR_INVALID_OPERATION),
|
| + base::Closure());
|
| }
|
|
|
| void ProviderAsyncFileUtil::EnsureFileExists(
|
| @@ -100,7 +102,7 @@ void ProviderAsyncFileUtil::EnsureFileExists(
|
| const fileapi::FileSystemURL& url,
|
| const EnsureFileExistsCallback& callback) {
|
| DCHECK_CURRENTLY_ON(BrowserThread::IO);
|
| - callback.Run(base::File::FILE_ERROR_SECURITY, false /* created */);
|
| + callback.Run(base::File::FILE_ERROR_ACCESS_DENIED, false /* created */);
|
| }
|
|
|
| void ProviderAsyncFileUtil::CreateDirectory(
|
| @@ -110,7 +112,7 @@ void ProviderAsyncFileUtil::CreateDirectory(
|
| bool recursive,
|
| const StatusCallback& callback) {
|
| DCHECK_CURRENTLY_ON(BrowserThread::IO);
|
| - callback.Run(base::File::FILE_ERROR_SECURITY);
|
| + callback.Run(base::File::FILE_ERROR_ACCESS_DENIED);
|
| }
|
|
|
| void ProviderAsyncFileUtil::GetFileInfo(
|
| @@ -146,7 +148,7 @@ void ProviderAsyncFileUtil::Touch(
|
| const base::Time& last_modified_time,
|
| const StatusCallback& callback) {
|
| DCHECK_CURRENTLY_ON(BrowserThread::IO);
|
| - callback.Run(base::File::FILE_ERROR_SECURITY);
|
| + callback.Run(base::File::FILE_ERROR_ACCESS_DENIED);
|
| }
|
|
|
| void ProviderAsyncFileUtil::Truncate(
|
| @@ -155,7 +157,7 @@ void ProviderAsyncFileUtil::Truncate(
|
| int64 length,
|
| const StatusCallback& callback) {
|
| DCHECK_CURRENTLY_ON(BrowserThread::IO);
|
| - callback.Run(base::File::FILE_ERROR_SECURITY);
|
| + callback.Run(base::File::FILE_ERROR_ACCESS_DENIED);
|
| }
|
|
|
| void ProviderAsyncFileUtil::CopyFileLocal(
|
| @@ -166,7 +168,7 @@ void ProviderAsyncFileUtil::CopyFileLocal(
|
| const CopyFileProgressCallback& progress_callback,
|
| const StatusCallback& callback) {
|
| DCHECK_CURRENTLY_ON(BrowserThread::IO);
|
| - callback.Run(base::File::FILE_ERROR_SECURITY);
|
| + callback.Run(base::File::FILE_ERROR_ACCESS_DENIED);
|
| }
|
|
|
| void ProviderAsyncFileUtil::MoveFileLocal(
|
| @@ -176,7 +178,7 @@ void ProviderAsyncFileUtil::MoveFileLocal(
|
| CopyOrMoveOption option,
|
| const StatusCallback& callback) {
|
| DCHECK_CURRENTLY_ON(BrowserThread::IO);
|
| - callback.Run(base::File::FILE_ERROR_SECURITY);
|
| + callback.Run(base::File::FILE_ERROR_ACCESS_DENIED);
|
| }
|
|
|
| void ProviderAsyncFileUtil::CopyInForeignFile(
|
| @@ -185,7 +187,7 @@ void ProviderAsyncFileUtil::CopyInForeignFile(
|
| const fileapi::FileSystemURL& dest_url,
|
| const StatusCallback& callback) {
|
| DCHECK_CURRENTLY_ON(BrowserThread::IO);
|
| - callback.Run(base::File::FILE_ERROR_SECURITY);
|
| + callback.Run(base::File::FILE_ERROR_ACCESS_DENIED);
|
| }
|
|
|
| void ProviderAsyncFileUtil::DeleteFile(
|
| @@ -193,7 +195,7 @@ void ProviderAsyncFileUtil::DeleteFile(
|
| const fileapi::FileSystemURL& url,
|
| const StatusCallback& callback) {
|
| DCHECK_CURRENTLY_ON(BrowserThread::IO);
|
| - callback.Run(base::File::FILE_ERROR_SECURITY);
|
| + callback.Run(base::File::FILE_ERROR_ACCESS_DENIED);
|
| }
|
|
|
| void ProviderAsyncFileUtil::DeleteDirectory(
|
| @@ -201,7 +203,7 @@ void ProviderAsyncFileUtil::DeleteDirectory(
|
| const fileapi::FileSystemURL& url,
|
| const StatusCallback& callback) {
|
| DCHECK_CURRENTLY_ON(BrowserThread::IO);
|
| - callback.Run(base::File::FILE_ERROR_SECURITY);
|
| + callback.Run(base::File::FILE_ERROR_ACCESS_DENIED);
|
| }
|
|
|
| void ProviderAsyncFileUtil::DeleteRecursively(
|
| @@ -209,7 +211,7 @@ void ProviderAsyncFileUtil::DeleteRecursively(
|
| const fileapi::FileSystemURL& url,
|
| const StatusCallback& callback) {
|
| DCHECK_CURRENTLY_ON(BrowserThread::IO);
|
| - callback.Run(base::File::FILE_ERROR_SECURITY);
|
| + callback.Run(base::File::FILE_ERROR_ACCESS_DENIED);
|
| }
|
|
|
| void ProviderAsyncFileUtil::CreateSnapshotFile(
|
| @@ -218,7 +220,7 @@ void ProviderAsyncFileUtil::CreateSnapshotFile(
|
| const CreateSnapshotFileCallback& callback) {
|
| DCHECK_CURRENTLY_ON(BrowserThread::IO);
|
| NOTIMPLEMENTED();
|
| - callback.Run(base::File::FILE_ERROR_NOT_FOUND,
|
| + callback.Run(base::File::FILE_ERROR_INVALID_OPERATION,
|
| base::File::Info(),
|
| base::FilePath(),
|
| scoped_refptr<webkit_blob::ShareableFileReference>());
|
|
|