Revert 108258 - broke Mac LayoutTests.

Merge FileUtilProxy and FileSystemFileUtilProxy using PostTaskAndReply: CreateOrOpen/Close

Deprecating MessageProxyRelay class and getting rid of duplicated code.

BUG=none
TEST=test_shell_tests:\*FileSystem\*

Review URL: http://codereview.chromium.org/8424006

TBR=kinuko@chromium.org
Review URL: http://codereview.chromium.org/8423041

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@108274 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 10 insertions, 31 deletions

diff --git a/webkit/fileapi/file_system_operation.cc b/webkit/fileapi/file_system_operation.cc
index 84f66eb..7c504a6 100644
--- a/webkit/fileapi/file_system_operation.cc
+++ b/webkit/fileapi/file_system_operation.cc
@@ -71,17 +71,10 @@ FileSystemOperation::FileSystemOperation(
 }
 
 FileSystemOperation::~FileSystemOperation() {
-  if (file_writer_delegate_.get()) {
-    FileSystemOperationContext* c =
-        new FileSystemOperationContext(operation_context_);
-    base::FileUtilProxy::RelayClose(
-        proxy_,
-        base::Bind(&FileSystemFileUtil::Close,
-                   base::Unretained(c->src_file_util()),
-                   base::Owned(c)),
-        file_writer_delegate_->file(),
+  if (file_writer_delegate_.get())
+    FileSystemFileUtilProxy::Close(
+        operation_context_, proxy_, file_writer_delegate_->file(),
         FileSystemFileUtilProxy::StatusCallback());
-  }
 }
 
 void FileSystemOperation::OpenFileSystem(
@@ -373,19 +366,12 @@ void FileSystemOperation::DelayedWriteForQuota(quota::QuotaStatusCode status,
       operation_context_.src_origin_url(),
       operation_context_.src_type()));
 
-  int file_flags = base::PLATFORM_FILE_OPEN |
-                   base::PLATFORM_FILE_WRITE |
-                   base::PLATFORM_FILE_ASYNC;
-
-  base::FileUtilProxy::RelayCreateOrOpen(
+  FileSystemFileUtilProxy::CreateOrOpen(
+      operation_context_,
       proxy_,
-      base::Bind(&FileSystemFileUtil::CreateOrOpen,
-                 base::Unretained(operation_context_.src_file_util()),
-                 base::Unretained(&operation_context_),
-                 src_virtual_path_, file_flags),
-      base::Bind(&FileSystemFileUtil::Close,
-                 base::Unretained(operation_context_.src_file_util()),
-                 base::Unretained(&operation_context_)),
+      src_virtual_path_,
+      base::PLATFORM_FILE_OPEN | base::PLATFORM_FILE_WRITE |
+          base::PLATFORM_FILE_ASYNC,
       base::Bind(&FileSystemOperation::OnFileOpenedForWrite,
                  weak_factory_.GetWeakPtr()));
 }
@@ -492,15 +478,8 @@ void FileSystemOperation::DelayedOpenFileForQuota(quota::QuotaStatusCode status,
       operation_context_.src_origin_url(),
       operation_context_.src_type()));
 
-  base::FileUtilProxy::RelayCreateOrOpen(
-      proxy_,
-      base::Bind(&FileSystemFileUtil::CreateOrOpen,
-                 base::Unretained(operation_context_.src_file_util()),
-                 base::Unretained(&operation_context_),
-                 src_virtual_path_, file_flags_),
-      base::Bind(&FileSystemFileUtil::Close,
-                 base::Unretained(operation_context_.src_file_util()),
-                 base::Unretained(&operation_context_)),
+  FileSystemFileUtilProxy::CreateOrOpen(
+      operation_context_, proxy_, src_virtual_path_, file_flags_,
       base::Bind(&FileSystemOperation::DidOpenFile,
                  weak_factory_.GetWeakPtr()));
 }