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

webkit/fileapi/file_system_test_helper.h

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef WEBKIT_FILEAPI_FILE_SYSTEM_TEST_HELPER_H_
 #define WEBKIT_FILEAPI_FILE_SYSTEM_TEST_HELPER_H_
 #pragma once
 
 #include <string>
 
 #include "base/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "googleurl/src/gurl.h"
 #include "webkit/fileapi/file_system_types.h"
 #include "webkit/fileapi/file_system_util.h"
 #include "webkit/quota/quota_types.h"
 
 namespace quota {
 class QuotaManagerProxy;
 }
 
 class FilePath;
 
 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.
 class FileSystemTestOriginHelper {
  public:
   FileSystemTestOriginHelper(const GURL& origin, FileSystemType type);
   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;
   FilePath GetLocalPath(const FilePath& path);
   FilePath GetLocalPathFromASCII(const std::string& path);
   GURL GetURLForPath(const FilePath& path) const;
   FilePath GetUsageCachePath() const;
 
   int64 GetCachedOriginUsage() const;
   bool RevokeUsageCache() const;
   int64 ComputeCurrentOriginUsage() const;
 
   FileSystemOperation* NewOperation(
       FileSystemCallbackDispatcher* callback_dispatcher);
   FileSystemOperationContext* NewOperationContext();
 
   FileSystemContext* file_system_context() const {
     return file_system_context_.get();
   }
 
   const GURL& origin() const { return origin_; }
   FileSystemType type() const { return type_; }
   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);
 
   scoped_refptr<FileSystemContext> file_system_context_;
   const GURL origin_;
   const FileSystemType type_;
-  FileSystemFileUtil* file_util_;
+  FileUtil* file_util_;
   int64 initial_usage_size_;
 };
 
 }  // namespace fileapi
 
 #endif  // WEBKIT_FILEAPI_FILE_SYSTEM_TEST_HELPER_H_