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

webkit/fileapi/local_file_util.h

Index: webkit/fileapi/local_file_util.h
diff --git a/webkit/fileapi/local_file_system_file_util.h b/webkit/fileapi/local_file_util.h
similarity index 72%
rename from webkit/fileapi/local_file_system_file_util.h
rename to webkit/fileapi/local_file_util.h
index 314895e4e7c3a1df757b4a4ed2c223cf0bd0c855..d41b7aff2235be67afe1944d8e569178ed352fe6 100644
--- a/webkit/fileapi/local_file_system_file_util.h
+++ b/webkit/fileapi/local_file_util.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_FILEAPI_LOCAL_FILE_SYSTEM_FILE_UTIL_H_
-#define WEBKIT_FILEAPI_LOCAL_FILE_SYSTEM_FILE_UTIL_H_
+#ifndef WEBKIT_FILEAPI_LOCAL_FILE_UTIL_H_
+#define WEBKIT_FILEAPI_LOCAL_FILE_UTIL_H_
 
 #include <vector>
 
@@ -14,8 +14,8 @@
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/platform_file.h"
-#include "webkit/fileapi/file_system_file_util.h"
 #include "webkit/fileapi/file_system_types.h"
+#include "webkit/fileapi/fileapi_file_util.h"
 
 namespace base {
 struct PlatformFileInfo;
@@ -33,93 +33,92 @@ using base::PlatformFileError;
 class FileSystemOperationContext;
 
 // An instance of this class is created and owned by *MountPointProvider.
-class LocalFileSystemFileUtil : public FileSystemFileUtil {
+class LocalFileUtil : public FileApiFileUtil {
  public:
   // |underlying_file_util| is owned by the instance.  It will be deleted by
   // the owner instance.  For example, it can be instanciated as follows:
-  // FileSystemFileUtil* file_system_file_util =
-  //     new LocalFileSystemFileUtil(new FileSystemFileUtil());
-  explicit LocalFileSystemFileUtil(FileSystemFileUtil* underlying_file_util);
-  virtual ~LocalFileSystemFileUtil();
+  // FileApiFileUtil* file_util = new LocalFileUtil(new NativeFileUtil());
+  explicit LocalFileUtil(FileApiFileUtil* underlying_file_util);
+  virtual ~LocalFileUtil();
 
   virtual PlatformFileError CreateOrOpen(
       FileSystemOperationContext* context,
       const FilePath& file_path,
       int file_flags,
       PlatformFile* file_handle,
-      bool* created);
+      bool* created) OVERRIDE;
 
   virtual PlatformFileError EnsureFileExists(
       FileSystemOperationContext* context,
-      const FilePath& file_path, bool* created);
+      const FilePath& file_path, bool* created) OVERRIDE;
 
   virtual PlatformFileError GetLocalFilePath(
       FileSystemOperationContext* context,
       const FilePath& virtual_file,
-      FilePath* local_path);
+      FilePath* local_path) OVERRIDE;
 
   virtual PlatformFileError GetFileInfo(
       FileSystemOperationContext* context,
       const FilePath& file,
       base::PlatformFileInfo* file_info,
-      FilePath* platform_file);
+      FilePath* platform_file) OVERRIDE;
 
   virtual PlatformFileError ReadDirectory(
       FileSystemOperationContext* context,
       const FilePath& file_path,
-      std::vector<base::FileUtilProxy::Entry>* entries);
+      std::vector<base::FileUtilProxy::Entry>* entries) OVERRIDE;
 
   virtual PlatformFileError CreateDirectory(
       FileSystemOperationContext* context,
       const FilePath& file_path,
       bool exclusive,
-      bool recursive);
+      bool recursive) OVERRIDE;
 
   virtual PlatformFileError CopyOrMoveFile(
       FileSystemOperationContext* context,
       const FilePath& src_file_path,
       const FilePath& dest_file_path,
-      bool copy);
+      bool copy) OVERRIDE;
 
   virtual PlatformFileError CopyInForeignFile(
         FileSystemOperationContext* context,
         const FilePath& src_file_path,
-        const FilePath& dest_file_path);
+        const FilePath& dest_file_path) OVERRIDE;
 
   virtual PlatformFileError DeleteFile(
       FileSystemOperationContext* context,
-      const FilePath& file_path);
+      const FilePath& file_path) OVERRIDE;
 
   virtual PlatformFileError DeleteSingleDirectory(
       FileSystemOperationContext* context,
-      const FilePath& file_path);
+      const FilePath& file_path) OVERRIDE;
 
   virtual PlatformFileError Touch(
       FileSystemOperationContext* context,
       const FilePath& file_path,
       const base::Time& last_access_time,
-      const base::Time& last_modified_time);
+      const base::Time& last_modified_time) OVERRIDE;
 
   virtual PlatformFileError Truncate(
       FileSystemOperationContext* context,
       const FilePath& path,
-      int64 length);
+      int64 length) OVERRIDE;
 
   virtual bool PathExists(
       FileSystemOperationContext* context,
-      const FilePath& file_path);
+      const FilePath& file_path) OVERRIDE;
 
   virtual bool DirectoryExists(
       FileSystemOperationContext* context,
-      const FilePath& file_path);
+      const FilePath& file_path) OVERRIDE;
 
   virtual bool IsDirectoryEmpty(
       FileSystemOperationContext* context,
-      const FilePath& file_path);
+      const FilePath& file_path) OVERRIDE;
 
   virtual AbstractFileEnumerator* CreateFileEnumerator(
       FileSystemOperationContext* context,
-      const FilePath& root_path);
+      const FilePath& root_path) OVERRIDE;
 
  private:
   // Given the filesystem's root URL and a virtual path, produces a real, full
@@ -130,11 +129,9 @@ class LocalFileSystemFileUtil : public FileSystemFileUtil {
       FileSystemType type,
       const FilePath& virtual_path);
 
-  scoped_ptr<FileSystemFileUtil> underlying_file_util_;
-
-  DISALLOW_COPY_AND_ASSIGN(LocalFileSystemFileUtil);
+  DISALLOW_COPY_AND_ASSIGN(LocalFileUtil);
 };
 
 }  // namespace fileapi
 
-#endif  // WEBKIT_FILEAPI_LOCAL_FILE_SYSTEM_FILE_UTIL_H_
+#endif  // WEBKIT_FILEAPI_LOCAL_FILE_UTIL_H_