| Index: chrome/browser/media_galleries/fileapi/itunes_file_util.cc
|
| diff --git a/chrome/browser/media_galleries/fileapi/itunes_file_util.cc b/chrome/browser/media_galleries/fileapi/itunes_file_util.cc
|
| index e3e7b139f81fa37a529e8c792950891ea663653a..9cce7a8464c5af625de46bcb0e75dff38201d627 100644
|
| --- a/chrome/browser/media_galleries/fileapi/itunes_file_util.cc
|
| +++ b/chrome/browser/media_galleries/fileapi/itunes_file_util.cc
|
| @@ -8,6 +8,7 @@
|
|
|
| #include <set>
|
| #include <string>
|
| +#include <utility>
|
| #include <vector>
|
|
|
| #include "base/bind_helpers.h"
|
| @@ -75,7 +76,7 @@ void ITunesFileUtil::GetFileInfoOnTaskRunnerThread(
|
| // |data_provider| may be NULL if the file system was revoked before this
|
| // operation had a chance to run.
|
| if (!data_provider) {
|
| - GetFileInfoWithFreshDataProvider(context.Pass(), url, callback, false);
|
| + GetFileInfoWithFreshDataProvider(std::move(context), url, callback, false);
|
| } else {
|
| data_provider->RefreshData(
|
| base::Bind(&ITunesFileUtil::GetFileInfoWithFreshDataProvider,
|
| @@ -92,7 +93,8 @@ void ITunesFileUtil::ReadDirectoryOnTaskRunnerThread(
|
| // |data_provider| may be NULL if the file system was revoked before this
|
| // operation had a chance to run.
|
| if (!data_provider) {
|
| - ReadDirectoryWithFreshDataProvider(context.Pass(), url, callback, false);
|
| + ReadDirectoryWithFreshDataProvider(std::move(context), url, callback,
|
| + false);
|
| } else {
|
| data_provider->RefreshData(
|
| base::Bind(&ITunesFileUtil::ReadDirectoryWithFreshDataProvider,
|
| @@ -109,7 +111,7 @@ void ITunesFileUtil::CreateSnapshotFileOnTaskRunnerThread(
|
| // |data_provider| may be NULL if the file system was revoked before this
|
| // operation had a chance to run.
|
| if (!data_provider) {
|
| - CreateSnapshotFileWithFreshDataProvider(context.Pass(), url, callback,
|
| + CreateSnapshotFileWithFreshDataProvider(std::move(context), url, callback,
|
| false);
|
| } else {
|
| data_provider->RefreshData(
|
| @@ -363,7 +365,7 @@ void ITunesFileUtil::GetFileInfoWithFreshDataProvider(
|
| }
|
| return;
|
| }
|
| - NativeMediaFileUtil::GetFileInfoOnTaskRunnerThread(context.Pass(), url,
|
| + NativeMediaFileUtil::GetFileInfoOnTaskRunnerThread(std::move(context), url,
|
| callback);
|
| }
|
|
|
| @@ -381,7 +383,7 @@ void ITunesFileUtil::ReadDirectoryWithFreshDataProvider(
|
| }
|
| return;
|
| }
|
| - NativeMediaFileUtil::ReadDirectoryOnTaskRunnerThread(context.Pass(), url,
|
| + NativeMediaFileUtil::ReadDirectoryOnTaskRunnerThread(std::move(context), url,
|
| callback);
|
| }
|
|
|
| @@ -403,8 +405,8 @@ void ITunesFileUtil::CreateSnapshotFileWithFreshDataProvider(
|
| }
|
| return;
|
| }
|
| - NativeMediaFileUtil::CreateSnapshotFileOnTaskRunnerThread(context.Pass(), url,
|
| - callback);
|
| + NativeMediaFileUtil::CreateSnapshotFileOnTaskRunnerThread(std::move(context),
|
| + url, callback);
|
| }
|
|
|
| ITunesDataProvider* ITunesFileUtil::GetDataProvider() {
|
|
|