Cleanup: Deprecate FileUtilProxy::RelayFileTask

webkit/fileapi/file_system_file_util_proxy.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "webkit/fileapi/file_system_file_util_proxy.h"
 
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/sequenced_task_runner.h"
+#include "base/task_runner_util.h"
 #include "webkit/fileapi/file_system_context.h"
 #include "webkit/fileapi/file_system_file_util.h"
 #include "webkit/fileapi/file_system_operation_context.h"
 #include "webkit/fileapi/file_util_helper.h"
 
 namespace fileapi {
 
 using base::Bind;
 using base::Callback;
 using base::Owned;
@@ skipping 86 matching lines @@
 
 }  // namespace
 
 // static
 bool FileSystemFileUtilProxy::Delete(
     FileSystemOperationContext* context,
     FileSystemFileUtil* file_util,
     const FileSystemURL& url,
     bool recursive,
     const StatusCallback& callback) {
-  return base::FileUtilProxy::RelayFileTask(
+  return base::PostTaskAndReplyWithResult(
       context->task_runner(), FROM_HERE,
       Bind(&FileUtilHelper::Delete, context, file_util, url, recursive),
       callback);
 }
 
 // static
 bool FileSystemFileUtilProxy::CreateOrOpen(
     FileSystemOperationContext* context,
     FileSystemFileUtil* file_util,
     const FileSystemURL& url,
     int file_flags,
     const CreateOrOpenCallback& callback) {
   return base::FileUtilProxy::RelayCreateOrOpen(
       context->task_runner(),
       Bind(&FileSystemFileUtil::CreateOrOpen, Unretained(file_util),
            context, url, file_flags),
       Bind(&FileSystemFileUtil::Close, Unretained(file_util),
            context),
       callback);
 }
 
 // static
 bool FileSystemFileUtilProxy::Copy(
     FileSystemOperationContext* context,
     FileSystemFileUtil* src_util,
     FileSystemFileUtil* dest_util,
     const FileSystemURL& src_url,
     const FileSystemURL& dest_url,
     const StatusCallback& callback) {
-  return base::FileUtilProxy::RelayFileTask(
+  return base::PostTaskAndReplyWithResult(
       context->task_runner(), FROM_HERE,
       Bind(&FileUtilHelper::Copy,
            context, src_util, dest_util, src_url, dest_url),
       callback);
 }
 
 // static
 bool FileSystemFileUtilProxy::CopyInForeignFile(
     FileSystemOperationContext* context,
     FileSystemFileUtil* dest_util,
     const FilePath& src_local_disk_file_path,
     const FileSystemURL& dest_url,
     const StatusCallback& callback) {
-  return base::FileUtilProxy::RelayFileTask(
+  return base::PostTaskAndReplyWithResult(
       context->task_runner(), FROM_HERE,
       Bind(&FileSystemFileUtil::CopyInForeignFile, Unretained(dest_util),
            context, src_local_disk_file_path, dest_url),
       callback);
 }
 
 // static
 bool FileSystemFileUtilProxy::Move(
     FileSystemOperationContext* context,
       FileSystemFileUtil* src_util,
       FileSystemFileUtil* dest_util,
       const FileSystemURL& src_url,
       const FileSystemURL& dest_url,
     const StatusCallback& callback) {
-  return base::FileUtilProxy::RelayFileTask(
+  return base::PostTaskAndReplyWithResult(
       context->task_runner(), FROM_HERE,
       Bind(&FileUtilHelper::Move,
            context, src_util, dest_util, src_url, dest_url),
       callback);
 }
 
 // static
 bool FileSystemFileUtilProxy::EnsureFileExists(
     FileSystemOperationContext* context,
     FileSystemFileUtil* file_util,
     const FileSystemURL& url,
     const EnsureFileExistsCallback& callback) {
   EnsureFileExistsHelper* helper = new EnsureFileExistsHelper;
   return context->task_runner()->PostTaskAndReply(
         FROM_HERE,
         Bind(&EnsureFileExistsHelper::RunWork, Unretained(helper),
              file_util, context, url),
         Bind(&EnsureFileExistsHelper::Reply, Owned(helper), callback));
 }
 
 // static
 bool FileSystemFileUtilProxy::CreateDirectory(
     FileSystemOperationContext* context,
     FileSystemFileUtil* file_util,
     const FileSystemURL& url,
     bool exclusive,
     bool recursive,
     const StatusCallback& callback) {
-  return base::FileUtilProxy::RelayFileTask(
+  return base::PostTaskAndReplyWithResult(
       context->task_runner(), FROM_HERE,
       Bind(&FileSystemFileUtil::CreateDirectory, Unretained(file_util),
            context, url, exclusive, recursive),
       callback);
 }
 
 // static
 bool FileSystemFileUtilProxy::GetFileInfo(
     FileSystemOperationContext* context,
     FileSystemFileUtil* file_util,
@@ skipping 36 matching lines @@
 }
 
 // static
 bool FileSystemFileUtilProxy::Touch(
     FileSystemOperationContext* context,
     FileSystemFileUtil* file_util,
     const FileSystemURL& url,
     const base::Time& last_access_time,
     const base::Time& last_modified_time,
     const StatusCallback& callback) {
-  return base::FileUtilProxy::RelayFileTask(
+  return base::PostTaskAndReplyWithResult(
       context->task_runner(), FROM_HERE,
       Bind(&FileSystemFileUtil::Touch, Unretained(file_util),
            context, url, last_access_time, last_modified_time),
       callback);
 }
 
 // static
 bool FileSystemFileUtilProxy::Truncate(
     FileSystemOperationContext* context,
     FileSystemFileUtil* file_util,
     const FileSystemURL& url,
     int64 length,
     const StatusCallback& callback) {
-  return base::FileUtilProxy::RelayFileTask(
+  return base::PostTaskAndReplyWithResult(
       context->task_runner(), FROM_HERE,
       Bind(&FileSystemFileUtil::Truncate, Unretained(file_util),
            context, url, length),
       callback);
 }
 
 }  // namespace fileapi