| Index: webkit/fileapi/file_system_file_util_proxy.cc
|
| diff --git a/webkit/fileapi/file_system_file_util_proxy.cc b/webkit/fileapi/file_system_file_util_proxy.cc
|
| index f26d279663f777c047ed43c42853c256d8fb771f..a9476015874967b16bf7b39d3a96fc66175b9cb0 100644
|
| --- a/webkit/fileapi/file_system_file_util_proxy.cc
|
| +++ b/webkit/fileapi/file_system_file_util_proxy.cc
|
| @@ -6,7 +6,7 @@
|
|
|
| #include "base/bind.h"
|
| #include "base/memory/scoped_ptr.h"
|
| -#include "base/message_loop_proxy.h"
|
| +#include "base/task_runner.h"
|
| #include "webkit/fileapi/file_system_file_util.h"
|
| #include "webkit/fileapi/file_system_operation_context.h"
|
| #include "webkit/fileapi/file_util_helper.h"
|
| @@ -92,28 +92,28 @@ class ReadDirectoryHelper {
|
|
|
| // static
|
| bool FileSystemFileUtilProxy::Delete(
|
| - MessageLoopProxy* message_loop_proxy,
|
| + base::TaskRunner* task_runner,
|
| FileSystemOperationContext* context,
|
| FileSystemFileUtil* file_util,
|
| const FileSystemPath& path,
|
| bool recursive,
|
| const StatusCallback& callback) {
|
| return base::FileUtilProxy::RelayFileTask(
|
| - message_loop_proxy, FROM_HERE,
|
| + task_runner, FROM_HERE,
|
| Bind(&FileUtilHelper::Delete, context, file_util, path, recursive),
|
| callback);
|
| }
|
|
|
| // static
|
| bool FileSystemFileUtilProxy::CreateOrOpen(
|
| - MessageLoopProxy* message_loop_proxy,
|
| + base::TaskRunner* task_runner,
|
| FileSystemOperationContext* context,
|
| FileSystemFileUtil* file_util,
|
| const FileSystemPath& path,
|
| int file_flags,
|
| const CreateOrOpenCallback& callback) {
|
| return base::FileUtilProxy::RelayCreateOrOpen(
|
| - message_loop_proxy,
|
| + task_runner,
|
| Bind(&FileSystemFileUtil::CreateOrOpen, Unretained(file_util),
|
| context, path, file_flags),
|
| Bind(&FileSystemFileUtil::Close, Unretained(file_util),
|
| @@ -123,7 +123,7 @@ bool FileSystemFileUtilProxy::CreateOrOpen(
|
|
|
| // static
|
| bool FileSystemFileUtilProxy::Copy(
|
| - MessageLoopProxy* message_loop_proxy,
|
| + base::TaskRunner* task_runner,
|
| FileSystemOperationContext* context,
|
| FileSystemFileUtil* src_util,
|
| FileSystemFileUtil* dest_util,
|
| @@ -131,7 +131,7 @@ bool FileSystemFileUtilProxy::Copy(
|
| const FileSystemPath& dest_path,
|
| const StatusCallback& callback) {
|
| return base::FileUtilProxy::RelayFileTask(
|
| - message_loop_proxy, FROM_HERE,
|
| + task_runner, FROM_HERE,
|
| Bind(&FileUtilHelper::Copy,
|
| context, src_util, dest_util, src_path, dest_path),
|
| callback);
|
| @@ -139,7 +139,7 @@ bool FileSystemFileUtilProxy::Copy(
|
|
|
| // static
|
| bool FileSystemFileUtilProxy::Move(
|
| - MessageLoopProxy* message_loop_proxy,
|
| + base::TaskRunner* task_runner,
|
| FileSystemOperationContext* context,
|
| FileSystemFileUtil* src_util,
|
| FileSystemFileUtil* dest_util,
|
| @@ -147,7 +147,7 @@ bool FileSystemFileUtilProxy::Move(
|
| const FileSystemPath& dest_path,
|
| const StatusCallback& callback) {
|
| return base::FileUtilProxy::RelayFileTask(
|
| - message_loop_proxy, FROM_HERE,
|
| + task_runner, FROM_HERE,
|
| Bind(&FileUtilHelper::Move,
|
| context, src_util, dest_util, src_path, dest_path),
|
| callback);
|
| @@ -155,13 +155,13 @@ bool FileSystemFileUtilProxy::Move(
|
|
|
| // static
|
| bool FileSystemFileUtilProxy::EnsureFileExists(
|
| - MessageLoopProxy* message_loop_proxy,
|
| + base::TaskRunner* task_runner,
|
| FileSystemOperationContext* context,
|
| FileSystemFileUtil* file_util,
|
| const FileSystemPath& path,
|
| const EnsureFileExistsCallback& callback) {
|
| EnsureFileExistsHelper* helper = new EnsureFileExistsHelper;
|
| - return message_loop_proxy->PostTaskAndReply(
|
| + return task_runner->PostTaskAndReply(
|
| FROM_HERE,
|
| Bind(&EnsureFileExistsHelper::RunWork, Unretained(helper),
|
| file_util, context, path),
|
| @@ -170,7 +170,7 @@ bool FileSystemFileUtilProxy::EnsureFileExists(
|
|
|
| // static
|
| bool FileSystemFileUtilProxy::CreateDirectory(
|
| - MessageLoopProxy* message_loop_proxy,
|
| + base::TaskRunner* task_runner,
|
| FileSystemOperationContext* context,
|
| FileSystemFileUtil* file_util,
|
| const FileSystemPath& path,
|
| @@ -178,7 +178,7 @@ bool FileSystemFileUtilProxy::CreateDirectory(
|
| bool recursive,
|
| const StatusCallback& callback) {
|
| return base::FileUtilProxy::RelayFileTask(
|
| - message_loop_proxy, FROM_HERE,
|
| + task_runner, FROM_HERE,
|
| Bind(&FileSystemFileUtil::CreateDirectory, Unretained(file_util),
|
| context, path, exclusive, recursive),
|
| callback);
|
| @@ -186,13 +186,13 @@ bool FileSystemFileUtilProxy::CreateDirectory(
|
|
|
| // static
|
| bool FileSystemFileUtilProxy::GetFileInfo(
|
| - MessageLoopProxy* message_loop_proxy,
|
| + base::TaskRunner* task_runner,
|
| FileSystemOperationContext* context,
|
| FileSystemFileUtil* file_util,
|
| const FileSystemPath& path,
|
| const GetFileInfoCallback& callback) {
|
| GetFileInfoHelper* helper = new GetFileInfoHelper;
|
| - return message_loop_proxy->PostTaskAndReply(
|
| + return task_runner->PostTaskAndReply(
|
| FROM_HERE,
|
| Bind(&GetFileInfoHelper::RunWork, Unretained(helper),
|
| file_util, context, path),
|
| @@ -201,13 +201,13 @@ bool FileSystemFileUtilProxy::GetFileInfo(
|
|
|
| // static
|
| bool FileSystemFileUtilProxy::ReadDirectory(
|
| - MessageLoopProxy* message_loop_proxy,
|
| + base::TaskRunner* task_runner,
|
| FileSystemOperationContext* context,
|
| FileSystemFileUtil* file_util,
|
| const FileSystemPath& path,
|
| const ReadDirectoryCallback& callback) {
|
| ReadDirectoryHelper* helper = new ReadDirectoryHelper;
|
| - return message_loop_proxy->PostTaskAndReply(
|
| + return task_runner->PostTaskAndReply(
|
| FROM_HERE,
|
| Bind(&ReadDirectoryHelper::RunWork, Unretained(helper),
|
| file_util, context, path),
|
| @@ -216,7 +216,7 @@ bool FileSystemFileUtilProxy::ReadDirectory(
|
|
|
| // static
|
| bool FileSystemFileUtilProxy::Touch(
|
| - MessageLoopProxy* message_loop_proxy,
|
| + base::TaskRunner* task_runner,
|
| FileSystemOperationContext* context,
|
| FileSystemFileUtil* file_util,
|
| const FileSystemPath& path,
|
| @@ -224,7 +224,7 @@ bool FileSystemFileUtilProxy::Touch(
|
| const base::Time& last_modified_time,
|
| const StatusCallback& callback) {
|
| return base::FileUtilProxy::RelayFileTask(
|
| - message_loop_proxy, FROM_HERE,
|
| + task_runner, FROM_HERE,
|
| Bind(&FileSystemFileUtil::Touch, Unretained(file_util),
|
| context, path, last_access_time, last_modified_time),
|
| callback);
|
| @@ -232,14 +232,14 @@ bool FileSystemFileUtilProxy::Touch(
|
|
|
| // static
|
| bool FileSystemFileUtilProxy::Truncate(
|
| - MessageLoopProxy* message_loop_proxy,
|
| + base::TaskRunner* task_runner,
|
| FileSystemOperationContext* context,
|
| FileSystemFileUtil* file_util,
|
| const FileSystemPath& path,
|
| int64 length,
|
| const StatusCallback& callback) {
|
| return base::FileUtilProxy::RelayFileTask(
|
| - message_loop_proxy, FROM_HERE,
|
| + task_runner, FROM_HERE,
|
| Bind(&FileSystemFileUtil::Truncate, Unretained(file_util),
|
| context, path, length),
|
| callback);
|
|
|