Stackable file_util for FileAPIs. Sample code for discussion. Incomplete. Cannot be compiled.

webkit/fileapi/file_system_operation.cc

Index: webkit/fileapi/file_system_operation.cc
diff --git a/webkit/fileapi/file_system_operation.cc b/webkit/fileapi/file_system_operation.cc
index cea953e281bd07a025b57a54d7ea1c3e84e84b3f..896144cc16f25f17b153067469420bf4134c2975 100644
--- a/webkit/fileapi/file_system_operation.cc
+++ b/webkit/fileapi/file_system_operation.cc
@@ -8,6 +8,7 @@
 #include "net/url_request/url_request_context.h"
 #include "webkit/fileapi/file_system_callback_dispatcher.h"
 #include "webkit/fileapi/file_system_context.h"
+#include "webkit/fileapi/file_system_file_util_proxy.h"
 #include "webkit/fileapi/file_system_path_manager.h"
 #include "webkit/fileapi/file_system_quota_manager.h"
 #include "webkit/fileapi/file_writer_delegate.h"
@@ -30,7 +31,9 @@ FileSystemOperation::FileSystemOperation(
 
 FileSystemOperation::~FileSystemOperation() {
   if (file_writer_delegate_.get())
-    base::FileUtilProxy::Close(proxy_, file_writer_delegate_->file(), NULL);
+    fileapi::FileSystemFileUtilProxy::Close(
+        file_system_operation_context_.get(),
+        proxy_, file_writer_delegate_->file(), NULL);
 }
 
 void FileSystemOperation::OpenFileSystem(
@@ -58,10 +61,11 @@ void FileSystemOperation::CreateFile(const FilePath& path,
     delete this;
     return;
   }
-  base::FileUtilProxy::EnsureFileExists(
-    proxy_, path, callback_factory_.NewCallback(
-        exclusive ? &FileSystemOperation::DidEnsureFileExistsExclusive
-                  : &FileSystemOperation::DidEnsureFileExistsNonExclusive));
+  fileapi::FileSystemFileUtilProxy::EnsureFileExists(
+      file_system_operation_context_.get(),
+      proxy_, path, callback_factory_.NewCallback(
+          exclusive ? &FileSystemOperation::DidEnsureFileExistsExclusive
+                    : &FileSystemOperation::DidEnsureFileExistsNonExclusive));
 }
 
 void FileSystemOperation::CreateDirectory(const FilePath& path,
@@ -76,7 +80,8 @@ void FileSystemOperation::CreateDirectory(const FilePath& path,
     delete this;
     return;
   }
-  base::FileUtilProxy::CreateDirectory(
+  fileapi::FileSystemFileUtilProxy::CreateDirectory(
+      file_system_operation_context_.get(),
       proxy_, path, exclusive, recursive, callback_factory_.NewCallback(
           &FileSystemOperation::DidFinishFileOperation));
 }
@@ -94,7 +99,9 @@ void FileSystemOperation::Copy(const FilePath& src_path,
     delete this;
     return;
   }
-  base::FileUtilProxy::Copy(proxy_, src_path, dest_path,
+  fileapi::FileSystemFileUtilProxy::Copy(
+      file_system_operation_context_.get(),
+      proxy_, src_path, dest_path,
       callback_factory_.NewCallback(
           &FileSystemOperation::DidFinishFileOperation));
 }
@@ -112,7 +119,9 @@ void FileSystemOperation::Move(const FilePath& src_path,
     delete this;
     return;
   }
-  base::FileUtilProxy::Move(proxy_, src_path, dest_path,
+  fileapi::FileSystemFileUtilProxy::Move(
+      file_system_operation_context_.get(),
+      proxy_, src_path, dest_path,
       callback_factory_.NewCallback(
           &FileSystemOperation::DidFinishFileOperation));
 }
@@ -127,7 +136,9 @@ void FileSystemOperation::DirectoryExists(const FilePath& path) {
     delete this;
     return;
   }
-  base::FileUtilProxy::GetFileInfo(proxy_, path, callback_factory_.NewCallback(
+  fileapi::FileSystemFileUtilProxy::GetFileInfo(
+      file_system_operation_context_.get(),
+      proxy_, path, callback_factory_.NewCallback(
       &FileSystemOperation::DidDirectoryExists));
 }
 
@@ -141,7 +152,9 @@ void FileSystemOperation::FileExists(const FilePath& path) {
     delete this;
     return;
   }
-  base::FileUtilProxy::GetFileInfo(proxy_, path, callback_factory_.NewCallback(
+  fileapi::FileSystemFileUtilProxy::GetFileInfo(
+      file_system_operation_context_.get(),
+      proxy_, path, callback_factory_.NewCallback(
       &FileSystemOperation::DidFileExists));
 }
 
@@ -155,7 +168,9 @@ void FileSystemOperation::GetMetadata(const FilePath& path) {
     delete this;
     return;
   }
-  base::FileUtilProxy::GetFileInfo(proxy_, path, callback_factory_.NewCallback(
+  fileapi::FileSystemFileUtilProxy::GetFileInfo(
+      file_system_operation_context_.get(),
+      proxy_, path, callback_factory_.NewCallback(
       &FileSystemOperation::DidGetMetadata));
 }
 
@@ -169,7 +184,9 @@ void FileSystemOperation::ReadDirectory(const FilePath& path) {
     delete this;
     return;
   }
-  base::FileUtilProxy::ReadDirectory(proxy_, path,
+  fileapi::FileSystemFileUtilProxy::ReadDirectory(
+      file_system_operation_context_.get(),
+      proxy_, path,
       callback_factory_.NewCallback(
           &FileSystemOperation::DidReadDirectory));
 }
@@ -184,7 +201,9 @@ void FileSystemOperation::Remove(const FilePath& path, bool recursive) {
     delete this;
     return;
   }
-  base::FileUtilProxy::Delete(proxy_, path, recursive,
+  fileapi::FileSystemFileUtilProxy::Delete(
+      file_system_operation_context_.get(),
+      proxy_, path, recursive,
       callback_factory_.NewCallback(
           &FileSystemOperation::DidFinishFileOperation));
 }
@@ -208,7 +227,8 @@ void FileSystemOperation::Write(
   blob_request_.reset(
       new net::URLRequest(blob_url, file_writer_delegate_.get()));
   blob_request_->set_context(url_request_context);
-  base::FileUtilProxy::CreateOrOpen(
+  fileapi::FileSystemFileUtilProxy::CreateOrOpen(
+      file_system_operation_context_.get(),
       proxy_,
       path,
       base::PLATFORM_FILE_OPEN | base::PLATFORM_FILE_WRITE |
@@ -226,7 +246,9 @@ void FileSystemOperation::Truncate(const FilePath& path, int64 length) {
     delete this;
     return;
   }
-  base::FileUtilProxy::Truncate(proxy_, path, length,
+  fileapi::FileSystemFileUtilProxy::Truncate(
+      file_system_operation_context_.get(),
+      proxy_, path, length,
       callback_factory_.NewCallback(
           &FileSystemOperation::DidFinishFileOperation));
 }
@@ -243,7 +265,8 @@ void FileSystemOperation::TouchFile(const FilePath& path,
     delete this;
     return;
   }
-  base::FileUtilProxy::Touch(
+  fileapi::FileSystemFileUtilProxy::Touch(
+      file_system_operation_context_.get(),
       proxy_, path, last_access_time, last_modified_time,
       callback_factory_.NewCallback(&FileSystemOperation::DidTouchFile));
 }