| Index: chrome/browser/media_galleries/fileapi/native_media_file_util.cc
|
| diff --git a/chrome/browser/media_galleries/fileapi/native_media_file_util.cc b/chrome/browser/media_galleries/fileapi/native_media_file_util.cc
|
| index af3c52af9428f4c056867e1b16bc42420f2eba43..810a26d892b1312eb4d18df076f6defed5a1c62d 100644
|
| --- a/chrome/browser/media_galleries/fileapi/native_media_file_util.cc
|
| +++ b/chrome/browser/media_galleries/fileapi/native_media_file_util.cc
|
| @@ -156,9 +156,9 @@ void NativeMediaFileUtil::CreateDirectory(
|
| storage::FileSystemOperationContext* context_ptr = context.get();
|
| const bool success = context_ptr->task_runner()->PostTask(
|
| FROM_HERE,
|
| - base::Bind(&NativeMediaFileUtil::CreateDirectoryOnTaskRunnerThread,
|
| - weak_factory_.GetWeakPtr(), base::Passed(&context),
|
| - url, exclusive, recursive, callback));
|
| + base::BindOnce(&NativeMediaFileUtil::CreateDirectoryOnTaskRunnerThread,
|
| + weak_factory_.GetWeakPtr(), base::Passed(&context), url,
|
| + exclusive, recursive, callback));
|
| DCHECK(success);
|
| }
|
|
|
| @@ -171,9 +171,9 @@ void NativeMediaFileUtil::GetFileInfo(
|
| storage::FileSystemOperationContext* context_ptr = context.get();
|
| const bool success = context_ptr->task_runner()->PostTask(
|
| FROM_HERE,
|
| - base::Bind(&NativeMediaFileUtil::GetFileInfoOnTaskRunnerThread,
|
| - weak_factory_.GetWeakPtr(), base::Passed(&context),
|
| - url, callback));
|
| + base::BindOnce(&NativeMediaFileUtil::GetFileInfoOnTaskRunnerThread,
|
| + weak_factory_.GetWeakPtr(), base::Passed(&context), url,
|
| + callback));
|
| DCHECK(success);
|
| }
|
|
|
| @@ -185,9 +185,9 @@ void NativeMediaFileUtil::ReadDirectory(
|
| storage::FileSystemOperationContext* context_ptr = context.get();
|
| const bool success = context_ptr->task_runner()->PostTask(
|
| FROM_HERE,
|
| - base::Bind(&NativeMediaFileUtil::ReadDirectoryOnTaskRunnerThread,
|
| - weak_factory_.GetWeakPtr(), base::Passed(&context),
|
| - url, callback));
|
| + base::BindOnce(&NativeMediaFileUtil::ReadDirectoryOnTaskRunnerThread,
|
| + weak_factory_.GetWeakPtr(), base::Passed(&context), url,
|
| + callback));
|
| DCHECK(success);
|
| }
|
|
|
| @@ -221,9 +221,10 @@ void NativeMediaFileUtil::CopyFileLocal(
|
| storage::FileSystemOperationContext* context_ptr = context.get();
|
| const bool success = context_ptr->task_runner()->PostTask(
|
| FROM_HERE,
|
| - base::Bind(&NativeMediaFileUtil::CopyOrMoveFileLocalOnTaskRunnerThread,
|
| - weak_factory_.GetWeakPtr(), base::Passed(&context),
|
| - src_url, dest_url, option, true /* copy */, callback));
|
| + base::BindOnce(
|
| + &NativeMediaFileUtil::CopyOrMoveFileLocalOnTaskRunnerThread,
|
| + weak_factory_.GetWeakPtr(), base::Passed(&context), src_url, dest_url,
|
| + option, true /* copy */, callback));
|
| DCHECK(success);
|
| }
|
|
|
| @@ -237,9 +238,10 @@ void NativeMediaFileUtil::MoveFileLocal(
|
| storage::FileSystemOperationContext* context_ptr = context.get();
|
| const bool success = context_ptr->task_runner()->PostTask(
|
| FROM_HERE,
|
| - base::Bind(&NativeMediaFileUtil::CopyOrMoveFileLocalOnTaskRunnerThread,
|
| - weak_factory_.GetWeakPtr(), base::Passed(&context),
|
| - src_url, dest_url, option, false /* copy */, callback));
|
| + base::BindOnce(
|
| + &NativeMediaFileUtil::CopyOrMoveFileLocalOnTaskRunnerThread,
|
| + weak_factory_.GetWeakPtr(), base::Passed(&context), src_url, dest_url,
|
| + option, false /* copy */, callback));
|
| DCHECK(success);
|
| }
|
|
|
| @@ -252,9 +254,9 @@ void NativeMediaFileUtil::CopyInForeignFile(
|
| storage::FileSystemOperationContext* context_ptr = context.get();
|
| const bool success = context_ptr->task_runner()->PostTask(
|
| FROM_HERE,
|
| - base::Bind(&NativeMediaFileUtil::CopyInForeignFileOnTaskRunnerThread,
|
| - weak_factory_.GetWeakPtr(), base::Passed(&context),
|
| - src_file_path, dest_url, callback));
|
| + base::BindOnce(&NativeMediaFileUtil::CopyInForeignFileOnTaskRunnerThread,
|
| + weak_factory_.GetWeakPtr(), base::Passed(&context),
|
| + src_file_path, dest_url, callback));
|
| DCHECK(success);
|
| }
|
|
|
| @@ -266,9 +268,9 @@ void NativeMediaFileUtil::DeleteFile(
|
| storage::FileSystemOperationContext* context_ptr = context.get();
|
| const bool success = context_ptr->task_runner()->PostTask(
|
| FROM_HERE,
|
| - base::Bind(&NativeMediaFileUtil::DeleteFileOnTaskRunnerThread,
|
| - weak_factory_.GetWeakPtr(), base::Passed(&context),
|
| - url, callback));
|
| + base::BindOnce(&NativeMediaFileUtil::DeleteFileOnTaskRunnerThread,
|
| + weak_factory_.GetWeakPtr(), base::Passed(&context), url,
|
| + callback));
|
| DCHECK(success);
|
| }
|
|
|
| @@ -281,9 +283,9 @@ void NativeMediaFileUtil::DeleteDirectory(
|
| storage::FileSystemOperationContext* context_ptr = context.get();
|
| const bool success = context_ptr->task_runner()->PostTask(
|
| FROM_HERE,
|
| - base::Bind(&NativeMediaFileUtil::DeleteDirectoryOnTaskRunnerThread,
|
| - weak_factory_.GetWeakPtr(), base::Passed(&context),
|
| - url, callback));
|
| + base::BindOnce(&NativeMediaFileUtil::DeleteDirectoryOnTaskRunnerThread,
|
| + weak_factory_.GetWeakPtr(), base::Passed(&context), url,
|
| + callback));
|
| DCHECK(success);
|
| }
|
|
|
| @@ -303,9 +305,9 @@ void NativeMediaFileUtil::CreateSnapshotFile(
|
| storage::FileSystemOperationContext* context_ptr = context.get();
|
| const bool success = context_ptr->task_runner()->PostTask(
|
| FROM_HERE,
|
| - base::Bind(&NativeMediaFileUtil::CreateSnapshotFileOnTaskRunnerThread,
|
| - weak_factory_.GetWeakPtr(), base::Passed(&context),
|
| - url, callback));
|
| + base::BindOnce(&NativeMediaFileUtil::CreateSnapshotFileOnTaskRunnerThread,
|
| + weak_factory_.GetWeakPtr(), base::Passed(&context), url,
|
| + callback));
|
| DCHECK(success);
|
| }
|
|
|
| @@ -318,10 +320,8 @@ void NativeMediaFileUtil::CreateDirectoryOnTaskRunnerThread(
|
| DCHECK(IsOnTaskRunnerThread(context.get()));
|
| base::File::Error error =
|
| CreateDirectorySync(context.get(), url, exclusive, recursive);
|
| - content::BrowserThread::PostTask(
|
| - content::BrowserThread::IO,
|
| - FROM_HERE,
|
| - base::Bind(callback, error));
|
| + content::BrowserThread::PostTask(content::BrowserThread::IO, FROM_HERE,
|
| + base::BindOnce(callback, error));
|
| }
|
|
|
| void NativeMediaFileUtil::GetFileInfoOnTaskRunnerThread(
|
| @@ -332,10 +332,8 @@ void NativeMediaFileUtil::GetFileInfoOnTaskRunnerThread(
|
| base::File::Info file_info;
|
| base::File::Error error =
|
| GetFileInfoSync(context.get(), url, &file_info, NULL);
|
| - content::BrowserThread::PostTask(
|
| - content::BrowserThread::IO,
|
| - FROM_HERE,
|
| - base::Bind(callback, error, file_info));
|
| + content::BrowserThread::PostTask(content::BrowserThread::IO, FROM_HERE,
|
| + base::BindOnce(callback, error, file_info));
|
| }
|
|
|
| void NativeMediaFileUtil::ReadDirectoryOnTaskRunnerThread(
|
| @@ -347,9 +345,8 @@ void NativeMediaFileUtil::ReadDirectoryOnTaskRunnerThread(
|
| base::File::Error error =
|
| ReadDirectorySync(context.get(), url, &entry_list);
|
| content::BrowserThread::PostTask(
|
| - content::BrowserThread::IO,
|
| - FROM_HERE,
|
| - base::Bind(callback, error, entry_list, false /* has_more */));
|
| + content::BrowserThread::IO, FROM_HERE,
|
| + base::BindOnce(callback, error, entry_list, false /* has_more */));
|
| }
|
|
|
| void NativeMediaFileUtil::CopyOrMoveFileLocalOnTaskRunnerThread(
|
| @@ -362,10 +359,8 @@ void NativeMediaFileUtil::CopyOrMoveFileLocalOnTaskRunnerThread(
|
| DCHECK(IsOnTaskRunnerThread(context.get()));
|
| base::File::Error error =
|
| CopyOrMoveFileSync(context.get(), src_url, dest_url, option, copy);
|
| - content::BrowserThread::PostTask(
|
| - content::BrowserThread::IO,
|
| - FROM_HERE,
|
| - base::Bind(callback, error));
|
| + content::BrowserThread::PostTask(content::BrowserThread::IO, FROM_HERE,
|
| + base::BindOnce(callback, error));
|
| }
|
|
|
| void NativeMediaFileUtil::CopyInForeignFileOnTaskRunnerThread(
|
| @@ -376,10 +371,8 @@ void NativeMediaFileUtil::CopyInForeignFileOnTaskRunnerThread(
|
| DCHECK(IsOnTaskRunnerThread(context.get()));
|
| base::File::Error error =
|
| CopyInForeignFileSync(context.get(), src_file_path, dest_url);
|
| - content::BrowserThread::PostTask(
|
| - content::BrowserThread::IO,
|
| - FROM_HERE,
|
| - base::Bind(callback, error));
|
| + content::BrowserThread::PostTask(content::BrowserThread::IO, FROM_HERE,
|
| + base::BindOnce(callback, error));
|
| }
|
|
|
| void NativeMediaFileUtil::DeleteFileOnTaskRunnerThread(
|
| @@ -388,10 +381,8 @@ void NativeMediaFileUtil::DeleteFileOnTaskRunnerThread(
|
| const StatusCallback& callback) {
|
| DCHECK(IsOnTaskRunnerThread(context.get()));
|
| base::File::Error error = DeleteFileSync(context.get(), url);
|
| - content::BrowserThread::PostTask(
|
| - content::BrowserThread::IO,
|
| - FROM_HERE,
|
| - base::Bind(callback, error));
|
| + content::BrowserThread::PostTask(content::BrowserThread::IO, FROM_HERE,
|
| + base::BindOnce(callback, error));
|
| }
|
|
|
| void NativeMediaFileUtil::DeleteDirectoryOnTaskRunnerThread(
|
| @@ -400,10 +391,8 @@ void NativeMediaFileUtil::DeleteDirectoryOnTaskRunnerThread(
|
| const StatusCallback& callback) {
|
| DCHECK(IsOnTaskRunnerThread(context.get()));
|
| base::File::Error error = DeleteDirectorySync(context.get(), url);
|
| - content::BrowserThread::PostTask(
|
| - content::BrowserThread::IO,
|
| - FROM_HERE,
|
| - base::Bind(callback, error));
|
| + content::BrowserThread::PostTask(content::BrowserThread::IO, FROM_HERE,
|
| + base::BindOnce(callback, error));
|
| }
|
|
|
| void NativeMediaFileUtil::CreateSnapshotFileOnTaskRunnerThread(
|
| @@ -417,9 +406,8 @@ void NativeMediaFileUtil::CreateSnapshotFileOnTaskRunnerThread(
|
| base::File::Error error = CreateSnapshotFileSync(
|
| context.get(), url, &file_info, &platform_path, &file_ref);
|
| content::BrowserThread::PostTask(
|
| - content::BrowserThread::IO,
|
| - FROM_HERE,
|
| - base::Bind(callback, error, file_info, platform_path, file_ref));
|
| + content::BrowserThread::IO, FROM_HERE,
|
| + base::BindOnce(callback, error, file_info, platform_path, file_ref));
|
| }
|
|
|
| base::File::Error NativeMediaFileUtil::CreateDirectorySync(
|
|
|