[Refactor] to rename and re-layer the file_util stack layers.

webkit/fileapi/file_system_test_helper.h

Index: webkit/fileapi/file_system_test_helper.h
diff --git a/webkit/fileapi/file_system_test_helper.h b/webkit/fileapi/file_system_test_helper.h
index 209224893dbc98c379bb7ce17f7dbf2cb0168a46..20563e52b3798ada776e9a3f6f9b33989b6d6ff7 100644
--- a/webkit/fileapi/file_system_test_helper.h
+++ b/webkit/fileapi/file_system_test_helper.h
@@ -26,10 +26,10 @@ namespace fileapi {
 
 class FileSystemCallbackDispatcher;
 class FileSystemContext;
-class FileSystemFileUtil;
 class FileSystemOperation;
 class FileSystemOperationContext;
 class FileSystemPathManager;
+class FileUtil;
 
 // Filesystem test helper class that encapsulates test environment for
 // a given {origin, type} pair.
@@ -39,18 +39,17 @@ class FileSystemTestOriginHelper {
   FileSystemTestOriginHelper();
   ~FileSystemTestOriginHelper();
 
-  void SetUp(const FilePath& base_dir, FileSystemFileUtil* file_util);
+  void SetUp(const FilePath& base_dir, FileUtil* file_util);
   // If you want to use more than one FileSystemTestOriginHelper in a single
   // base directory, they have to share a context, so that they don't have
   // multiple databases fighting over the lock to the origin directory [deep
-  // down inside ObfuscatedFileSystemFileUtil].
-  void SetUp(FileSystemContext* file_system_context,
-      FileSystemFileUtil* file_util);
+  // down inside ObfuscatedFileUtil].
+  void SetUp(FileSystemContext* file_system_context, FileUtil* file_util);
   void SetUp(const FilePath& base_dir,
              bool incognito_mode,
              bool unlimited_quota,
              quota::QuotaManagerProxy* quota_manager_proxy,
-             FileSystemFileUtil* file_util);
+             FileUtil* file_util);
   void TearDown();
 
   FilePath GetOriginRootPath() const;
@@ -76,7 +75,7 @@ class FileSystemTestOriginHelper {
   quota::StorageType storage_type() const {
     return FileSystemTypeToQuotaStorageType(type_);
   }
-  FileSystemFileUtil* file_util() { return file_util_; }
+  FileUtil* file_util() { return file_util_; }
 
  private:
   void InitializeOperationContext(FileSystemOperationContext* context);
@@ -84,7 +83,7 @@ class FileSystemTestOriginHelper {
   scoped_refptr<FileSystemContext> file_system_context_;
   const GURL origin_;
   const FileSystemType type_;
-  FileSystemFileUtil* file_util_;
+  FileUtil* file_util_;
   int64 initial_usage_size_;
 };