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

webkit/fileapi/obfuscated_file_util.h

Index: webkit/fileapi/obfuscated_file_util.h
diff --git a/webkit/fileapi/obfuscated_file_system_file_util.h b/webkit/fileapi/obfuscated_file_util.h
similarity index 92%
rename from webkit/fileapi/obfuscated_file_system_file_util.h
rename to webkit/fileapi/obfuscated_file_util.h
index 063fcd5a48f284637fb20a18378abf391123c16a..e7025eb6494dce8cfe76b0eaef2e406737cb6624 100644
--- a/webkit/fileapi/obfuscated_file_system_file_util.h
+++ b/webkit/fileapi/obfuscated_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_OBFUSCATED_FILE_SYSTEM_FILE_UTIL_H_
-#define WEBKIT_FILEAPI_OBFUSCATED_FILE_SYSTEM_FILE_UTIL_H_
+#ifndef WEBKIT_FILEAPI_OBFUSCATED_FILE_UTIL_H_
+#define WEBKIT_FILEAPI_OBFUSCATED_FILE_UTIL_H_
 
 #include <map>
 #include <vector>
@@ -14,9 +14,9 @@
 #include "base/platform_file.h"
 #include "base/timer.h"
 #include "webkit/fileapi/file_system_directory_database.h"
-#include "webkit/fileapi/file_system_file_util.h"
 #include "webkit/fileapi/file_system_origin_database.h"
 #include "webkit/fileapi/file_system_types.h"
+#include "webkit/fileapi/fileapi_file_util.h"
 
 namespace base {
 struct PlatformFileInfo;
@@ -44,17 +44,15 @@ class FileSystemOperationContext;
 //
 // TODO(ericu): We don't ever update directory mtimes; which operations should
 // do that?
-class ObfuscatedFileSystemFileUtil : public FileSystemFileUtil,
-    public base::RefCountedThreadSafe<ObfuscatedFileSystemFileUtil> {
+class ObfuscatedFileUtil : public FileApiFileUtil,
+    public base::RefCountedThreadSafe<ObfuscatedFileUtil> {
  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 ObfuscatedFileSystemFileUtil(new FileSystemFileUtil());
-  ObfuscatedFileSystemFileUtil(
-      const FilePath& file_system_directory,
-      FileSystemFileUtil* underlying_file_util);
-  virtual ~ObfuscatedFileSystemFileUtil();
+  // FileApiFileUtil* file_util = new ObfuscatedFileUtil(new NativeFileUtil());
+  ObfuscatedFileUtil(const FilePath& file_system_directory,
+                     FileApiFileUtil* underlying_file_util);
+  virtual ~ObfuscatedFileUtil();
 
   virtual base::PlatformFileError CreateOrOpen(
       FileSystemOperationContext* context,
@@ -245,12 +243,11 @@ class ObfuscatedFileSystemFileUtil : public FileSystemFileUtil,
   DirectoryMap directories_;
   scoped_ptr<FileSystemOriginDatabase> origin_database_;
   FilePath file_system_directory_;
-  base::OneShotTimer<ObfuscatedFileSystemFileUtil> timer_;
-  scoped_ptr<FileSystemFileUtil> underlying_file_util_;
+  base::OneShotTimer<ObfuscatedFileUtil> timer_;
 
-  DISALLOW_COPY_AND_ASSIGN(ObfuscatedFileSystemFileUtil);
+  DISALLOW_COPY_AND_ASSIGN(ObfuscatedFileUtil);
 };
 
 }  // namespace fileapi
 
-#endif  // WEBKIT_FILEAPI_OBFUSCATED_FILE_SYSTEM_FILE_UTIL_H_
+#endif  // WEBKIT_FILEAPI_OBFUSCATED_FILE_UTIL_H_