Add initial code to do filename munging in the FileSystem....

webkit/fileapi/obfuscated_file_util_proxy.h

Index: webkit/fileapi/obfuscated_file_util_proxy.h
===================================================================
--- webkit/fileapi/obfuscated_file_util_proxy.h	(revision 72915)
+++ webkit/fileapi/obfuscated_file_util_proxy.h	(working copy)
@@ -2,108 +2,85 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef BASE_FILE_UTIL_PROXY_H_
-#define BASE_FILE_UTIL_PROXY_H_
+#ifndef WEBKIT_FILEAPI_OBFUSCATED_FILE_UTIL_PROXY_H_
+#define WEBKIT_FILEAPI_OBFUSCATED_FILE_UTIL_PROXY_H_
 
 #include <vector>
-
 #include "base/callback.h"
 #include "base/file_path.h"
-#include "base/file_util.h"
+#include "base/file_util_proxy.h"
 #include "base/platform_file.h"
-#include "base/ref_counted.h"
-#include "base/tracked_objects.h"
 
 namespace base {
-
 class MessageLoopProxy;
 class Time;
+}
 
-// This class provides asynchronous access to common file routines.
-class FileUtilProxy {
- public:
-  // Holds metadata for file or directory entry. Used by ReadDirectoryCallback.
-  struct Entry {
-    FilePath::StringType name;
-    bool is_directory;
-  };
+namespace fileapi {
 
-  // This callback is used by methods that report only an error code.  It is
-  // valid to pass NULL as the callback parameter to any function that takes a
-  // StatusCallback, in which case the operation will complete silently.
-  typedef Callback1<PlatformFileError /* error code */>::Type StatusCallback;
+class SandboxedFileSystemContext;
 
-  typedef Callback3<PlatformFileError /* error code */,
-                    PassPlatformFile,
-                    bool /* created */>::Type CreateOrOpenCallback;
-  typedef Callback3<PlatformFileError /* error code */,
-                    PassPlatformFile,
-                    FilePath>::Type CreateTemporaryCallback;
-  typedef Callback2<PlatformFileError /* error code */,
-                    bool /* created */>::Type EnsureFileExistsCallback;
-  typedef Callback2<PlatformFileError /* error code */,
-                    const PlatformFileInfo& /* file_info */
-                    >::Type GetFileInfoCallback;
-  typedef Callback2<PlatformFileError /* error code */,
-                    const std::vector<Entry>&>::Type ReadDirectoryCallback;
-  typedef Callback2<PlatformFileError /* error code */,
-                    int /* bytes read/written */>::Type ReadWriteCallback;
+class ObfuscatedFileUtilProxy : public base::FileUtilProxy {
+ public:
+  ObfuscatedFileUtilProxy(SandboxedFileSystemContext *file_system_context) :
+      file_system_context_(file_system_context) {
+  }
+  // Bridges to the file thread and does the series of operations necessary to
+  // create or open the file, as needed.  Creation requires updating [or
+  // creating] a single dictionary file.  Opening an existing file doesn't
+  // require any dictionary lookup.
+  // All the interesting stuff, including translations, should happen on the
+  // file thread.  That way ObfuscatedFileUtil can be called directly from the
+  // file thread and it'll do all the work.  Plus it removes synchronization
+  // problems to do it all in one long-running operation over there.  So these
+  // proxy functions are really thin wrappers.  Over on the file thread, the
+  // implementation of e.g. CreateDirectory will look like:
+  // * Read dictionary file; check for conflicts.
+  // * Update dictionary; write out dictionary.next.
+  // * Call FileUtil::CreateDirectory.
+  // * Move dictionary.next onto dictionary.
 
   // Creates or opens a file with the given flags.  It is invalid to pass NULL
   // for the callback.
   // If PLATFORM_FILE_CREATE is set in |file_flags| it always tries to create
   // a new file at the given |file_path| and calls back with
   // PLATFORM_FILE_ERROR_FILE_EXISTS if the |file_path| already exists.
-  static bool CreateOrOpen(scoped_refptr<MessageLoopProxy> message_loop_proxy,
-                           const FilePath& file_path,
-                           int file_flags,
-                           CreateOrOpenCallback* callback);
+//  bool CreateOrOpen(
+//      scoped_refptr<base::MessageLoopProxy> message_loop_proxy,
+//      const FilePath& file_path,
+//      int file_flags,
+//      CreateOrOpenCallback* callback);
 
-  // Creates a temporary file for writing.  The path and an open file handle
-  // are returned.  It is invalid to pass NULL for the callback.
-  static bool CreateTemporary(
-      scoped_refptr<MessageLoopProxy> message_loop_proxy,
-      CreateTemporaryCallback* callback);
-
-  // Close the given file handle.
-  static bool Close(scoped_refptr<MessageLoopProxy> message_loop_proxy,
-                    PlatformFile,
-                    StatusCallback* callback);
-
-  // Ensures that the given |file_path| exist.  This creates a empty new file
+  // Ensures that the given |file_path| exists.  This creates a empty new file
   // at |file_path| if the |file_path| does not exist.
-  // If a new file han not existed and is created at the |file_path|,
-  // |created| of the callback argument is set true and |error code|
-  // is set PLATFORM_FILE_OK.
-  // If the file already exists, |created| is set false and |error code|
-  // is set PLATFORM_FILE_OK.
-  // If the file hasn't existed but it couldn't be created for some other
-  // reasons, |created| is set false and |error code| indicates the error.
-  static bool EnsureFileExists(
-      scoped_refptr<MessageLoopProxy> message_loop_proxy,
-      const FilePath& file_path,
-      EnsureFileExistsCallback* callback);
+  // If the file had not existed and is created at the |file_path|,
+  // |created| of the callback argument is set to true and |error code|
+  // is set to PLATFORM_FILE_OK.
+  // If the file already exists, |created| is set to false and |error code|
+  // is set to PLATFORM_FILE_OK.
+  // If the file hadn't existed but it couldn't be created for any reason,
+  // |created| is set to false and |error code| indicates the error.
+//  bool EnsureFileExists(
+//      scoped_refptr<base::MessageLoopProxy> message_loop_proxy,
+//      const FilePath& file_path,
+//      EnsureFileExistsCallback* callback);
 
   // Retrieves the information about a file. It is invalid to pass NULL for the
   // callback.
-  static bool GetFileInfo(
-      scoped_refptr<MessageLoopProxy> message_loop_proxy,
-      const FilePath& file_path,
-      GetFileInfoCallback* callback);
+//  bool GetFileInfo(
+//      scoped_refptr<base::MessageLoopProxy> message_loop_proxy,
+//      const FilePath& file_path,
+//      GetFileInfoCallback* callback);
 
-  static bool GetFileInfoFromPlatformFile(
-      scoped_refptr<MessageLoopProxy> message_loop_proxy,
-      PlatformFile file,
-      GetFileInfoCallback* callback);
+//  bool ReadDirectory(
+//      scoped_refptr<base::MessageLoopProxy> message_loop_proxy,
+//      const FilePath& file_path,
+//      ReadDirectoryCallback* callback);
 
-  static bool ReadDirectory(scoped_refptr<MessageLoopProxy> message_loop_proxy,
-                            const FilePath& file_path,
-                            ReadDirectoryCallback* callback);
-
   // Creates directory at given path. It's an error to create
   // if |exclusive| is true and dir already exists.
-  static bool CreateDirectory(
-      scoped_refptr<MessageLoopProxy> message_loop_proxy,
+  bool CreateDirectory(
+      scoped_refptr<base::MessageLoopProxy> message_loop_proxy,
       const FilePath& file_path,
       bool exclusive,
       bool recursive,
@@ -117,97 +94,58 @@
   // If source file exists but destination path is an existing directory.
   // If source is a parent of destination.
   // If source doesn't exists.
-  static bool Copy(scoped_refptr<MessageLoopProxy> message_loop_proxy,
-                   const FilePath& src_file_path,
-                   const FilePath& dest_file_path,
-                   StatusCallback* callback);
+//  bool Copy(
+//      scoped_refptr<base::MessageLoopProxy> message_loop_proxy,
+//      const FilePath& src_file_path,
+//      const FilePath& dest_file_path,
+//      StatusCallback* callback);
 
   // Moves a file or a directory from src_file_path to dest_file_path.
   // Error cases are similar to Copy method's error cases.
-  static bool Move(
-      scoped_refptr<MessageLoopProxy> message_loop_proxy,
-      const FilePath& src_file_path,
-      const FilePath& dest_file_path,
-      StatusCallback* callback);
+//  bool Move(
+//      scoped_refptr<base::MessageLoopProxy> message_loop_proxy,
+//      const FilePath& src_file_path,
+//      const FilePath& dest_file_path,
+//      StatusCallback* callback);
 
   // Deletes a file or a directory.
   // It is an error to delete a non-empty directory with recursive=false.
-  static bool Delete(scoped_refptr<MessageLoopProxy> message_loop_proxy,
-                     const FilePath& file_path,
-                     bool recursive,
-                     StatusCallback* callback);
+//  bool Delete(
+//      scoped_refptr<base::MessageLoopProxy> message_loop_proxy,
+//      const FilePath& file_path,
+//      bool recursive,
+//      StatusCallback* callback);
 
   // Deletes a directory and all of its contents.
-  static bool RecursiveDelete(
-      scoped_refptr<MessageLoopProxy> message_loop_proxy,
-      const FilePath& file_path,
-      StatusCallback* callback);
+//  bool RecursiveDelete(
+//      scoped_refptr<base::MessageLoopProxy> message_loop_proxy,
+//      const FilePath& file_path,
+//      StatusCallback* callback);
 
-  // Reads from a file. On success, the file pointer is moved to position
-  // |offset + bytes_to_read| in the file. The callback can be NULL.
-  static bool Read(
-      scoped_refptr<MessageLoopProxy> message_loop_proxy,
-      PlatformFile file,
-      int64 offset,
-      char* buffer,
-      int bytes_to_read,
-      ReadWriteCallback* callback);
-
-  // Writes to a file. If |offset| is greater than the length of the file,
-  // |false| is returned. On success, the file pointer is moved to position
-  // |offset + bytes_to_write| in the file. The callback can be NULL.
-  static bool Write(
-      scoped_refptr<MessageLoopProxy> message_loop_proxy,
-      PlatformFile file,
-      int64 offset,
-      const char* buffer,
-      int bytes_to_write,
-      ReadWriteCallback* callback);
-
   // Touches a file. The callback can be NULL.
-  static bool Touch(
-      scoped_refptr<MessageLoopProxy> message_loop_proxy,
-      PlatformFile file,
-      const Time& last_access_time,
-      const Time& last_modified_time,
-      StatusCallback* callback);
+//  bool Touch(
+//      scoped_refptr<base::MessageLoopProxy> message_loop_proxy,
+//      const FilePath& file_path,
+//      const base::Time& last_access_time,
+//      const base::Time& last_modified_time,
+//      StatusCallback* callback);
 
-  // Touches a file. The callback can be NULL.
-  static bool Touch(
-      scoped_refptr<MessageLoopProxy> message_loop_proxy,
-      const FilePath& file_path,
-      const Time& last_access_time,
-      const Time& last_modified_time,
-      StatusCallback* callback);
-
   // Truncates a file to the given length. If |length| is greater than the
   // current length of the file, the file will be extended with zeroes.
   // The callback can be NULL.
-  static bool Truncate(
-      scoped_refptr<MessageLoopProxy> message_loop_proxy,
-      PlatformFile file,
-      int64 length,
-      StatusCallback* callback);
+//  bool Truncate(
+//      scoped_refptr<base::MessageLoopProxy> message_loop_proxy,
+//      const FilePath& path,
+//      int64 length,
+//      StatusCallback* callback);
 
-  // Truncates a file to the given length. If |length| is greater than the
-  // current length of the file, the file will be extended with zeroes.
-  // The callback can be NULL.
-  static bool Truncate(
-      scoped_refptr<MessageLoopProxy> message_loop_proxy,
-      const FilePath& path,
-      int64 length,
-      StatusCallback* callback);
-
-  // Flushes a file. The callback can be NULL.
-  static bool Flush(
-      scoped_refptr<MessageLoopProxy> message_loop_proxy,
-      PlatformFile file,
-      StatusCallback* callback);
-
  private:
-  DISALLOW_IMPLICIT_CONSTRUCTORS(FileUtilProxy);
+  void CrackPath(
+      const FilePath& file_path, FilePath* root, FilePath* virtual_path);
+  SandboxedFileSystemContext* file_system_context_;
+  DISALLOW_COPY_AND_ASSIGN(ObfuscatedFileUtilProxy);
 };
 
-}  // namespace base
+}  // namespace fileapi
 
-#endif  // BASE_FILE_UTIL_PROXY_H_
+#endif  // WEBKIT_FILEAPI_OBFUSCATED_FILE_UTIL_PROXY_H_