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..6b0aa626819f110663ebc75dee0139cb853b3211 100644
--- a/webkit/fileapi/obfuscated_file_system_file_util.h
+++ b/webkit/fileapi/obfuscated_file_system_file_util.h
@@ -47,8 +47,11 @@ class FileSystemOperationContext;
 class ObfuscatedFileSystemFileUtil : public FileSystemFileUtil,
     public base::RefCountedThreadSafe<ObfuscatedFileSystemFileUtil> {
  public:
-
-  ObfuscatedFileSystemFileUtil(const FilePath& file_system_directory);
+  // |underlying_file_util| is not owned by the instance.  It will need to be
+  // a singleton or to be deleted by someone else.
+  ObfuscatedFileSystemFileUtil(
+      const FilePath& file_system_directory,
+      FileSystemFileUtil* underlying_file_util);
   virtual ~ObfuscatedFileSystemFileUtil();
 
   virtual base::PlatformFileError CreateOrOpen(
@@ -224,6 +227,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);
 };