Refactoring: Change all -FileUtils non-Singleton and to own underlying FileUtils.

webkit/fileapi/quota_file_util.cc

 // 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.
 
 #include "webkit/fileapi/quota_file_util.h"
 
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "webkit/fileapi/file_system_context.h"
 #include "webkit/fileapi/file_system_operation_context.h"
@@ skipping 52 matching lines @@
   FileSystemOperationContext* operation_context_;
   FileSystemQuotaUtil* quota_util_;
   QuotaManagerProxy* quota_manager_proxy_;
   const GURL& origin_url_;
   FileSystemType type_;
   DISALLOW_COPY_AND_ASSIGN(ScopedOriginUpdateHelper);
 };
 
 }  // namespace (anonymous)
 
+QuotaFileUtil::QuotaFileUtil(FileSystemFileUtil* underlying_file_util)
+    : underlying_file_util_(underlying_file_util) {
+}
+
+QuotaFileUtil::~QuotaFileUtil() {
+}
+
 // static
-QuotaFileUtil* QuotaFileUtil::GetInstance() {
-  return Singleton<QuotaFileUtil>::get();
+QuotaFileUtil* QuotaFileUtil::GetDefault() {

[kinuko, 2011/07/26 06:00:35]

Please make the method name obvious that it creates a new instance.

[Dai Mikurube (NOT FULLTIME), 2011/07/26 06:52:46]

Done.

+  return new QuotaFileUtil(new FileSystemFileUtil());
 }
 
 int64 QuotaFileUtil::ComputeFilePathCost(const FilePath& file_path) const {
   return kFilePathCostPerFile +
       file_path.BaseName().value().length() * kFilePathCostPerChar;
 }
 
 PlatformFileError QuotaFileUtil::CreateOrOpen(
     FileSystemOperationContext* fs_context,
     const FilePath& file_path, int file_flags,
@@ skipping 10 matching lines @@
   if (growth > 0) {
     helper.reset(new ScopedOriginUpdateHelper(
         fs_context,
         fs_context->src_origin_url(),
         fs_context->src_type()));
 
     if (allowed_bytes_growth != kNoLimit && growth > allowed_bytes_growth)
       return base::PLATFORM_FILE_ERROR_NO_SPACE;
   }
 
-  base::PlatformFileError error = FileSystemFileUtil::GetInstance()->
-      CreateOrOpen(fs_context, file_path, file_flags, file_handle, created);
+  base::PlatformFileError error = underlying_file_util_->CreateOrOpen(
+      fs_context, file_path, file_flags, file_handle, created);
 
   if (growth > 0) {
     if (error == base::PLATFORM_FILE_OK)
       helper->NotifyUpdate(growth);
   }
 
   return error;
 }
 
 PlatformFileError QuotaFileUtil::EnsureFileExists(
@@ skipping 12 matching lines @@
   if (growth > 0) {
     helper.reset(new ScopedOriginUpdateHelper(
         fs_context,
         fs_context->src_origin_url(),
         fs_context->src_type()));
 
     if (allowed_bytes_growth != kNoLimit && growth > allowed_bytes_growth)
       return base::PLATFORM_FILE_ERROR_NO_SPACE;
   }
 
-  base::PlatformFileError error = FileSystemFileUtil::GetInstance()->
-      EnsureFileExists(fs_context, file_path, created);
+  base::PlatformFileError error = underlying_file_util_->EnsureFileExists(
+      fs_context, file_path, created);
 
   if (growth > 0 &&error == base::PLATFORM_FILE_OK)
     helper->NotifyUpdate(growth);
 
   return error;
 }
 
 PlatformFileError QuotaFileUtil::CreateDirectory(
     FileSystemOperationContext* fs_context,
     const FilePath& file_path,
@@ skipping 25 matching lines @@
     helper.reset(new ScopedOriginUpdateHelper(
         fs_context,
         fs_context->src_origin_url(),
         fs_context->src_type()));
 
     if (allowed_bytes_growth != kNoLimit && growth > allowed_bytes_growth)
       return base::PLATFORM_FILE_ERROR_NO_SPACE;
   }
 
   base::PlatformFileError error = base::PLATFORM_FILE_OK;
-  error = FileSystemFileUtil::GetInstance()->
-      CreateDirectory(fs_context, file_path, exclusive, recursive);
+  error = underlying_file_util_->CreateDirectory(
+      fs_context, file_path, exclusive, recursive);
 
   if (growth > 0 && error == base::PLATFORM_FILE_OK)
     helper->NotifyUpdate(growth);
 
   return error;
 }
 
 base::PlatformFileError QuotaFileUtil::CopyOrMoveFile(
     FileSystemOperationContext* fs_context,
     const FilePath& src_file_path,
@@ skipping 25 matching lines @@
         ComputeFilePathCost(fs_context->src_virtual_path());
     int64 dest_file_path_cost =
         ComputeFilePathCost(fs_context->dest_virtual_path());
     if (!file_util::GetFileInfo(dest_file_path, &dest_file_info))
       dest_file_info.size = 0;
     growth = -dest_file_info.size - src_file_path_cost + dest_file_path_cost;
     if (allowed_bytes_growth != kNoLimit && growth > allowed_bytes_growth)
       return base::PLATFORM_FILE_ERROR_NO_SPACE;
   }
 
-  base::PlatformFileError error = FileSystemFileUtil::GetInstance()->
-      CopyOrMoveFile(fs_context, src_file_path, dest_file_path, copy);
+  base::PlatformFileError error = underlying_file_util_->CopyOrMoveFile(
+      fs_context, src_file_path, dest_file_path, copy);
 
   if (error == base::PLATFORM_FILE_OK) {
     // TODO(kinuko): For cross-filesystem move case, call this with -growth
     // for source and growth for dest.
     helper.NotifyUpdate(growth);
   }
 
   return error;
 }
 
 base::PlatformFileError QuotaFileUtil::DeleteFile(
     FileSystemOperationContext* fs_context,
     const FilePath& file_path) {
   DCHECK(fs_context);
   ScopedOriginUpdateHelper helper(
       fs_context,
       fs_context->src_origin_url(),
       fs_context->src_type());
 
   int64 growth = 0;
   base::PlatformFileInfo file_info;
   if (file_util::GetFileInfo(file_path, &file_info)) {
     growth -= file_info.size +
         ComputeFilePathCost(fs_context->src_virtual_path());
   }
 
-  base::PlatformFileError error = FileSystemFileUtil::GetInstance()->
-      DeleteFile(fs_context, file_path);
+  base::PlatformFileError error = underlying_file_util_->DeleteFile(
+      fs_context, file_path);
 
   if (error == base::PLATFORM_FILE_OK)
     helper.NotifyUpdate(growth);
 
   return error;
 }
 
 base::PlatformFileError QuotaFileUtil::DeleteSingleDirectory(
       FileSystemOperationContext* fs_context,
       const FilePath& file_path) {
   DCHECK(fs_context);
   ScopedOriginUpdateHelper helper(
       fs_context,
       fs_context->src_origin_url(),
       fs_context->src_type());
 
   int64 growth = 0;
   if (file_util::DirectoryExists(file_path))
     growth -= ComputeFilePathCost(fs_context->src_virtual_path());
 
-  base::PlatformFileError error = FileSystemFileUtil::GetInstance()->
-      DeleteSingleDirectory(fs_context, file_path);
+  base::PlatformFileError error = underlying_file_util_->DeleteSingleDirectory(
+      fs_context, file_path);
 
   if (error == base::PLATFORM_FILE_OK)
     helper.NotifyUpdate(growth);
 
   return error;
 }
 
 base::PlatformFileError QuotaFileUtil::Truncate(
     FileSystemOperationContext* fs_context,
     const FilePath& path,
     int64 length) {
   int64 allowed_bytes_growth = fs_context->allowed_bytes_growth();
   ScopedOriginUpdateHelper helper(
       fs_context,
       fs_context->src_origin_url(),
       fs_context->src_type());
 
   int64 growth = 0;
   base::PlatformFileInfo file_info;
   if (!file_util::GetFileInfo(path, &file_info))
     return base::PLATFORM_FILE_ERROR_FAILED;
 
   growth = length - file_info.size;
   if (allowed_bytes_growth != kNoLimit && growth > allowed_bytes_growth)
     return base::PLATFORM_FILE_ERROR_NO_SPACE;
 
-  base::PlatformFileError error = FileSystemFileUtil::GetInstance()->Truncate(
+  base::PlatformFileError error = underlying_file_util_->Truncate(
       fs_context, path, length);
 
   if (error == base::PLATFORM_FILE_OK)
     helper.NotifyUpdate(growth);
 
   return error;
 }
 
 // Checks if copying in the same filesystem can be performed.
 // This method is not called for moving within a single filesystem.
@@ skipping 17 matching lines @@
   }
   *growth = src_file_info.size - dest_file_info.size + dest_file_path_cost;
   if (allowed_bytes_growth != QuotaFileUtil::kNoLimit &&
       *growth > allowed_bytes_growth)
     return false;
 
   return true;
 }
 
 }  // namespace fileapi