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

webkit/fileapi/obfuscated_file_util.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_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>
 
 #include "base/file_path.h"
 #include "base/file_util_proxy.h"
 #include "base/memory/ref_counted.h"
 #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"
+#include "webkit/fileapi/overlay_file_util.h"
 
 namespace base {
 struct PlatformFileInfo;
 class Time;
 }
 
 class GURL;
 
 namespace fileapi {
 
 class FileSystemOperationContext;
 
 // The overall implementation philosophy of this class is that partial failures
 // should leave us with an intact database; we'd prefer to leak the occasional
 // backing file than have a database entry whose backing file is missing.  When
 // doing FSCK operations, if you find a loose backing file with no reference,
 // you may safely delete it.
 //
 // This class is RefCountedThreadSafe because it may gain a reference on the IO
 // thread, but must be deleted on the FILE thread because that's where
 // DropDatabases needs to be called.  References will be held by the
 // SandboxMountPointProvider [and the task it uses to drop the reference] and
 // SandboxMountPointProvider::GetFileSystemRootPathTask.  Without that last one,
 // we wouldn't need ref counting.
 //
 // 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 OverlayFileUtil,
+    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();
+  // FileUtil* file_util = new ObfuscatedFileUtil(new NativeFileUtil());
+  ObfuscatedFileUtil(
+      const FilePath& file_system_directory, FileUtil* underlying_file_util);
+  virtual ~ObfuscatedFileUtil();
 
   virtual base::PlatformFileError CreateOrOpen(
       FileSystemOperationContext* context,
       const FilePath& file_path,
       int file_flags,
       base::PlatformFile* file_handle,
       bool* created) OVERRIDE;
 
   virtual base::PlatformFileError EnsureFileExists(
       FileSystemOperationContext* context,
@@ skipping 170 matching lines @@
   // contain both the filesystem type subdirectories.
   FilePath GetDirectoryForOrigin(const GURL& origin, bool create);
   void MarkUsed();
   void DropDatabases();
   bool InitOriginDatabase(bool create);
 
   typedef std::map<std::string, FileSystemDirectoryDatabase*> DirectoryMap;
   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_