Change {Obfuscated|Local}FileSystemFileUtil non-Singleton to take an underlying *FileUtil.

webkit/fileapi/obfuscated_file_system_file_util.h

Index: webkit/fileapi/obfuscated_file_system_file_util.h
diff --git a/webkit/fileapi/obfuscated_file_system_file_util.h b/webkit/fileapi/obfuscated_file_system_file_util.h
index 88caa65c555df57b790b1c00421f353590a12607..768d8e39c3d40a11c679c00674313fab79cbc503 100644
--- a/webkit/fileapi/obfuscated_file_system_file_util.h
+++ b/webkit/fileapi/obfuscated_file_system_file_util.h
@@ -48,7 +48,9 @@ class ObfuscatedFileSystemFileUtil : public FileSystemFileUtil,
     public base::RefCountedThreadSafe<ObfuscatedFileSystemFileUtil> {
  public:
 
-  ObfuscatedFileSystemFileUtil(const FilePath& file_system_directory);
+  ObfuscatedFileSystemFileUtil(
+      const FilePath& file_system_directory,
+      FileSystemFileUtil* underlying_file_util);
   virtual ~ObfuscatedFileSystemFileUtil();
 
   virtual base::PlatformFileError CreateOrOpen(
@@ -180,6 +182,8 @@ class ObfuscatedFileSystemFileUtil : public FileSystemFileUtil,
   typedef FileSystemDirectoryDatabase::FileId FileId;
   typedef FileSystemDirectoryDatabase::FileInfo FileInfo;
 
+  static ObfuscatedFileSystemFileUtil* GetInstance();

[ericu, 2011/06/17 20:32:07]

I think this got in here by accident.

[Dai Mikurube (NOT FULLTIME), 2011/06/23 08:13:32]

Oh, it's not required now.  Removed.

This declaration was required during development.  I kept it as private to catch
all calls of ObfuscatedFileSystemFileUtil::GetInstance().  Without it,
ObfuscatedFSFU::GetInstance() results in calling
FileSystemFileUtil::GetInstance().

+
   // Creates a new file, both the underlying backing file and the entry in the
   // database.  file_info is an in-out parameter.  Supply the name and
   // parent_id; data_path is ignored.  On success, data_path will
@@ -224,6 +228,7 @@ class ObfuscatedFileSystemFileUtil : public FileSystemFileUtil,
   scoped_ptr<FileSystemOriginDatabase> origin_database_;
   FilePath file_system_directory_;
   base::OneShotTimer<ObfuscatedFileSystemFileUtil> timer_;
+  FileSystemFileUtil* underlying_file_util_;
 
   DISALLOW_COPY_AND_ASSIGN(ObfuscatedFileSystemFileUtil);
 };