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

webkit/fileapi/obfuscated_file_util.cc

Index: webkit/fileapi/obfuscated_file_util.cc
diff --git a/webkit/fileapi/obfuscated_file_system_file_util.cc b/webkit/fileapi/obfuscated_file_util.cc
similarity index 93%
rename from webkit/fileapi/obfuscated_file_system_file_util.cc
rename to webkit/fileapi/obfuscated_file_util.cc
index 961eae92fc3d2b8e53d51f0d46bb2688ad79c554..b7917c47fc978a1301151b7368307a78245881b8 100644
--- a/webkit/fileapi/obfuscated_file_system_file_util.cc
+++ b/webkit/fileapi/obfuscated_file_util.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/fileapi/obfuscated_file_system_file_util.h"
+#include "webkit/fileapi/obfuscated_file_util.h"
 
 #include <queue>
 #include <vector>
@@ -55,18 +55,18 @@ namespace fileapi {
 using base::PlatformFile;
 using base::PlatformFileError;
 
-ObfuscatedFileSystemFileUtil::ObfuscatedFileSystemFileUtil(
+ObfuscatedFileUtil::ObfuscatedFileUtil(
     const FilePath& file_system_directory,
-    FileSystemFileUtil* underlying_file_util)
-    : file_system_directory_(file_system_directory),
-      underlying_file_util_(underlying_file_util) {
+    FileUtil* underlying_file_util)
+    : OverlayFileUtil(underlying_file_util),
+      file_system_directory_(file_system_directory) {
 }
 
-ObfuscatedFileSystemFileUtil::~ObfuscatedFileSystemFileUtil() {
+ObfuscatedFileUtil::~ObfuscatedFileUtil() {
   DropDatabases();
 }
 
-PlatformFileError ObfuscatedFileSystemFileUtil::CreateOrOpen(
+PlatformFileError ObfuscatedFileUtil::CreateOrOpen(
     FileSystemOperationContext* context,
     const FilePath& virtual_path, int file_flags,
     PlatformFile* file_handle, bool* created) {
@@ -111,7 +111,7 @@ PlatformFileError ObfuscatedFileSystemFileUtil::CreateOrOpen(
       context, data_path, file_flags, file_handle, created);
 }
 
-PlatformFileError ObfuscatedFileSystemFileUtil::EnsureFileExists(
+PlatformFileError ObfuscatedFileUtil::EnsureFileExists(
     FileSystemOperationContext* context,
     const FilePath& virtual_path,
     bool* created) {
@@ -145,7 +145,7 @@ PlatformFileError ObfuscatedFileSystemFileUtil::EnsureFileExists(
   return error;
 }
 
-PlatformFileError ObfuscatedFileSystemFileUtil::GetLocalFilePath(
+PlatformFileError ObfuscatedFileUtil::GetLocalFilePath(
     FileSystemOperationContext* context,
     const FilePath& virtual_path,
     FilePath* local_path) {
@@ -159,7 +159,7 @@ PlatformFileError ObfuscatedFileSystemFileUtil::GetLocalFilePath(
   return base::PLATFORM_FILE_OK;
 }
 
-PlatformFileError ObfuscatedFileSystemFileUtil::GetFileInfo(
+PlatformFileError ObfuscatedFileUtil::GetFileInfo(
     FileSystemOperationContext* context,
     const FilePath& virtual_path,
     base::PlatformFileInfo* file_info,
@@ -176,7 +176,7 @@ PlatformFileError ObfuscatedFileSystemFileUtil::GetFileInfo(
                              &local_info, file_info, platform_file_path);
 }
 
-PlatformFileError ObfuscatedFileSystemFileUtil::ReadDirectory(
+PlatformFileError ObfuscatedFileUtil::ReadDirectory(
     FileSystemOperationContext* context,
     const FilePath& virtual_path,
     std::vector<base::FileUtilProxy::Entry>* entries) {
@@ -229,7 +229,7 @@ PlatformFileError ObfuscatedFileSystemFileUtil::ReadDirectory(
   return base::PLATFORM_FILE_OK;
 }
 
-PlatformFileError ObfuscatedFileSystemFileUtil::CreateDirectory(
+PlatformFileError ObfuscatedFileUtil::CreateDirectory(
     FileSystemOperationContext* context,
     const FilePath& virtual_path,
     bool exclusive,
@@ -286,7 +286,7 @@ PlatformFileError ObfuscatedFileSystemFileUtil::CreateDirectory(
   return base::PLATFORM_FILE_OK;
 }
 
-PlatformFileError ObfuscatedFileSystemFileUtil::CopyOrMoveFile(
+PlatformFileError ObfuscatedFileUtil::CopyOrMoveFile(
     FileSystemOperationContext* context,
     const FilePath& src_file_path,
     const FilePath& dest_file_path,
@@ -375,7 +375,7 @@ PlatformFileError ObfuscatedFileSystemFileUtil::CopyOrMoveFile(
   return base::PLATFORM_FILE_ERROR_FAILED;
 }
 
-PlatformFileError ObfuscatedFileSystemFileUtil::CopyInForeignFile(
+PlatformFileError ObfuscatedFileUtil::CopyInForeignFile(
     FileSystemOperationContext* context,
     const FilePath& src_file_path,
     const FilePath& dest_file_path) {
@@ -410,7 +410,7 @@ PlatformFileError ObfuscatedFileSystemFileUtil::CopyInForeignFile(
   return base::PLATFORM_FILE_ERROR_FAILED;
 }
 
-PlatformFileError ObfuscatedFileSystemFileUtil::DeleteFile(
+PlatformFileError ObfuscatedFileUtil::DeleteFile(
     FileSystemOperationContext* context,
     const FilePath& virtual_path) {
   FileSystemDirectoryDatabase* db = GetDirectoryDatabase(
@@ -437,7 +437,7 @@ PlatformFileError ObfuscatedFileSystemFileUtil::DeleteFile(
   return base::PLATFORM_FILE_OK;
 }
 
-PlatformFileError ObfuscatedFileSystemFileUtil::DeleteSingleDirectory(
+PlatformFileError ObfuscatedFileUtil::DeleteSingleDirectory(
     FileSystemOperationContext* context,
     const FilePath& virtual_path) {
   FileSystemDirectoryDatabase* db = GetDirectoryDatabase(
@@ -457,7 +457,7 @@ PlatformFileError ObfuscatedFileSystemFileUtil::DeleteSingleDirectory(
   return base::PLATFORM_FILE_OK;
 }
 
-PlatformFileError ObfuscatedFileSystemFileUtil::Touch(
+PlatformFileError ObfuscatedFileUtil::Touch(
     FileSystemOperationContext* context,
     const FilePath& virtual_path,
     const base::Time& last_access_time,
@@ -503,7 +503,7 @@ PlatformFileError ObfuscatedFileSystemFileUtil::Touch(
     last_access_time, last_modified_time);
 }
 
-PlatformFileError ObfuscatedFileSystemFileUtil::Truncate(
+PlatformFileError ObfuscatedFileUtil::Truncate(
     FileSystemOperationContext* context,
     const FilePath& virtual_path,
     int64 length) {
@@ -516,7 +516,7 @@ PlatformFileError ObfuscatedFileSystemFileUtil::Truncate(
       context, local_path, length);
 }
 
-bool ObfuscatedFileSystemFileUtil::PathExists(
+bool ObfuscatedFileUtil::PathExists(
     FileSystemOperationContext* context,
     const FilePath& virtual_path) {
   FileSystemDirectoryDatabase* db = GetDirectoryDatabase(
@@ -527,7 +527,7 @@ bool ObfuscatedFileSystemFileUtil::PathExists(
   return db->GetFileWithPath(virtual_path, &file_id);
 }
 
-bool ObfuscatedFileSystemFileUtil::DirectoryExists(
+bool ObfuscatedFileUtil::DirectoryExists(
     FileSystemOperationContext* context,
     const FilePath& virtual_path) {
   if (IsRootDirectory(virtual_path)) {
@@ -555,7 +555,7 @@ bool ObfuscatedFileSystemFileUtil::DirectoryExists(
   return file_info.is_directory();
 }
 
-bool ObfuscatedFileSystemFileUtil::IsDirectoryEmpty(
+bool ObfuscatedFileUtil::IsDirectoryEmpty(
     FileSystemOperationContext* context,
     const FilePath& virtual_path) {
   FileSystemDirectoryDatabase* db = GetDirectoryDatabase(
@@ -581,7 +581,7 @@ bool ObfuscatedFileSystemFileUtil::IsDirectoryEmpty(
 }
 
 class ObfuscatedFileSystemFileEnumerator
-    : public FileSystemFileUtil::AbstractFileEnumerator {
+    : public FileUtil::AbstractFileEnumerator {
  public:
   ObfuscatedFileSystemFileEnumerator(
       FileSystemDirectoryDatabase* db, const FilePath& virtual_root_path)
@@ -652,7 +652,7 @@ class ObfuscatedFileSystemFileEnumerator
 };
 
 class ObfuscatedFileSystemOriginEnumerator
-    : public ObfuscatedFileSystemFileUtil::AbstractOriginEnumerator {
+    : public ObfuscatedFileUtil::AbstractOriginEnumerator {
  public:
   typedef FileSystemOriginDatabase::OriginRecord OriginRecord;
   ObfuscatedFileSystemOriginEnumerator(
@@ -681,7 +681,7 @@ class ObfuscatedFileSystemOriginEnumerator
     if (current_.path.empty())
       return false;
     FilePath::StringType type_string =
-        ObfuscatedFileSystemFileUtil::GetDirectoryNameForType(type);
+        ObfuscatedFileUtil::GetDirectoryNameForType(type);
     if (type_string.empty()) {
       NOTREACHED();
       return false;
@@ -696,8 +696,8 @@ class ObfuscatedFileSystemOriginEnumerator
   FilePath base_path_;
 };
 
-ObfuscatedFileSystemFileUtil::AbstractOriginEnumerator*
-ObfuscatedFileSystemFileUtil::CreateOriginEnumerator() {
+ObfuscatedFileUtil::AbstractOriginEnumerator*
+ObfuscatedFileUtil::CreateOriginEnumerator() {
   std::vector<FileSystemOriginDatabase::OriginRecord> origins;
 
   InitOriginDatabase(false);
@@ -705,18 +705,17 @@ ObfuscatedFileSystemFileUtil::CreateOriginEnumerator() {
       origin_database_.get(), file_system_directory_);
 }
 
-FileSystemFileUtil::AbstractFileEnumerator*
-ObfuscatedFileSystemFileUtil::CreateFileEnumerator(
+FileUtil::AbstractFileEnumerator* ObfuscatedFileUtil::CreateFileEnumerator(
     FileSystemOperationContext* context,
     const FilePath& root_path) {
   FileSystemDirectoryDatabase* db = GetDirectoryDatabase(
       context->src_origin_url(), context->src_type(), false);
   if (!db)
-    return new FileSystemFileUtil::EmptyFileEnumerator();
+    return new FileUtil::EmptyFileEnumerator();
   return new ObfuscatedFileSystemFileEnumerator(db, root_path);
 }
 
-PlatformFileError ObfuscatedFileSystemFileUtil::GetFileInfoInternal(
+PlatformFileError ObfuscatedFileUtil::GetFileInfoInternal(
     FileSystemDirectoryDatabase* db,
     FileSystemOperationContext* context,
     FileId file_id,
@@ -749,7 +748,7 @@ PlatformFileError ObfuscatedFileSystemFileUtil::GetFileInfoInternal(
       context, data_path, file_info, platform_file_path);
 }
 
-PlatformFileError ObfuscatedFileSystemFileUtil::CreateFile(
+PlatformFileError ObfuscatedFileUtil::CreateFile(
     FileSystemOperationContext* context,
     const GURL& origin_url, FileSystemType type, const FilePath& source_path,
     FileInfo* file_info, int file_flags, PlatformFile* handle) {
@@ -823,7 +822,7 @@ PlatformFileError ObfuscatedFileSystemFileUtil::CreateFile(
   return base::PLATFORM_FILE_OK;
 }
 
-FilePath ObfuscatedFileSystemFileUtil::GetLocalPath(
+FilePath ObfuscatedFileUtil::GetLocalPath(
     const GURL& origin_url,
     FileSystemType type,
     const FilePath& virtual_path) {
@@ -842,7 +841,7 @@ FilePath ObfuscatedFileSystemFileUtil::GetLocalPath(
   return DataPathToLocalPath(origin_url, type, file_info.data_path);
 }
 
-FilePath ObfuscatedFileSystemFileUtil::GetDirectoryForOriginAndType(
+FilePath ObfuscatedFileUtil::GetDirectoryForOriginAndType(
     const GURL& origin, FileSystemType type, bool create) {
   FilePath origin_dir = GetDirectoryForOrigin(origin, create);
   if (origin_dir.empty())
@@ -859,7 +858,7 @@ FilePath ObfuscatedFileSystemFileUtil::GetDirectoryForOriginAndType(
   return path;
 }
 
-bool ObfuscatedFileSystemFileUtil::DeleteDirectoryForOriginAndType(
+bool ObfuscatedFileUtil::DeleteDirectoryForOriginAndType(
     const GURL& origin, FileSystemType type) {
   FilePath origin_type_path = GetDirectoryForOriginAndType(origin, type, false);
   if (!file_util::PathExists(origin_type_path))
@@ -889,7 +888,7 @@ bool ObfuscatedFileSystemFileUtil::DeleteDirectoryForOriginAndType(
   return true;
 }
 
-bool ObfuscatedFileSystemFileUtil::MigrateFromOldSandbox(
+bool ObfuscatedFileUtil::MigrateFromOldSandbox(
     const GURL& origin_url, FileSystemType type, const FilePath& src_root) {
   if (!DestroyDirectoryDatabase(origin_url, type))
     return false;
@@ -961,7 +960,7 @@ bool ObfuscatedFileSystemFileUtil::MigrateFromOldSandbox(
 }
 
 // static
-FilePath::StringType ObfuscatedFileSystemFileUtil::GetDirectoryNameForType(
+FilePath::StringType ObfuscatedFileUtil::GetDirectoryNameForType(
     FileSystemType type) {
   switch (type) {
     case kFileSystemTypeTemporary:
@@ -974,7 +973,7 @@ FilePath::StringType ObfuscatedFileSystemFileUtil::GetDirectoryNameForType(
   }
 }
 
-FilePath ObfuscatedFileSystemFileUtil::DataPathToLocalPath(
+FilePath ObfuscatedFileUtil::DataPathToLocalPath(
     const GURL& origin, FileSystemType type, const FilePath& data_path) {
   FilePath root = GetDirectoryForOriginAndType(origin, type, false);
   if (root.empty())
@@ -982,7 +981,7 @@ FilePath ObfuscatedFileSystemFileUtil::DataPathToLocalPath(
   return root.Append(data_path);
 }
 
-FilePath ObfuscatedFileSystemFileUtil::LocalPathToDataPath(
+FilePath ObfuscatedFileUtil::LocalPathToDataPath(
     const GURL& origin, FileSystemType type, const FilePath& local_path) {
   FilePath root = GetDirectoryForOriginAndType(origin, type, false);
   if (root.empty())
@@ -995,7 +994,7 @@ FilePath ObfuscatedFileSystemFileUtil::LocalPathToDataPath(
 // TODO: How to do the whole validation-without-creation thing?  We may not have
 // quota even to create the database.  Ah, in that case don't even get here?
 // Still doesn't answer the quota issue, though.
-FileSystemDirectoryDatabase* ObfuscatedFileSystemFileUtil::GetDirectoryDatabase(
+FileSystemDirectoryDatabase* ObfuscatedFileUtil::GetDirectoryDatabase(
     const GURL& origin, FileSystemType type, bool create) {
   std::string type_string =
       FileSystemPathManager::GetFileSystemTypeString(type);
@@ -1026,7 +1025,7 @@ FileSystemDirectoryDatabase* ObfuscatedFileSystemFileUtil::GetDirectoryDatabase(
   return database;
 }
 
-FilePath ObfuscatedFileSystemFileUtil::GetDirectoryForOrigin(
+FilePath ObfuscatedFileUtil::GetDirectoryForOrigin(
     const GURL& origin, bool create) {
   if (!InitOriginDatabase(create))
     return FilePath();
@@ -1043,22 +1042,22 @@ FilePath ObfuscatedFileSystemFileUtil::GetDirectoryForOrigin(
   return path;
 }
 
-void ObfuscatedFileSystemFileUtil::MarkUsed() {
+void ObfuscatedFileUtil::MarkUsed() {
   if (timer_.IsRunning())
     timer_.Reset();
   else
     timer_.Start(base::TimeDelta::FromSeconds(kFlushDelaySeconds), this,
-      &ObfuscatedFileSystemFileUtil::DropDatabases);
+      &ObfuscatedFileUtil::DropDatabases);
 }
 
-void ObfuscatedFileSystemFileUtil::DropDatabases() {
+void ObfuscatedFileUtil::DropDatabases() {
   origin_database_.reset();
   STLDeleteContainerPairSecondPointers(
       directories_.begin(), directories_.end());
   directories_.clear();
 }
 
-bool ObfuscatedFileSystemFileUtil::DestroyDirectoryDatabase(
+bool ObfuscatedFileUtil::DestroyDirectoryDatabase(
     const GURL& origin, FileSystemType type) {
   std::string type_string =
       FileSystemPathManager::GetFileSystemTypeString(type);
@@ -1083,7 +1082,7 @@ bool ObfuscatedFileSystemFileUtil::DestroyDirectoryDatabase(
   return FileSystemDirectoryDatabase::DestroyDatabase(path);
 }
 
-bool ObfuscatedFileSystemFileUtil::InitOriginDatabase(bool create) {
+bool ObfuscatedFileUtil::InitOriginDatabase(bool create) {
   if (!origin_database_.get()) {
     if (!create && !file_util::DirectoryExists(file_system_directory_))
       return false;