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

webkit/fileapi/quota_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_QUOTA_FILE_UTIL_H_
 #define WEBKIT_FILEAPI_QUOTA_FILE_UTIL_H_
 
+#include "base/memory/scoped_ptr.h"
 #include "webkit/fileapi/file_system_file_util.h"
 #include "webkit/fileapi/file_system_operation_context.h"
 #pragma once
 
 namespace fileapi {
 
 class QuotaFileUtil : public FileSystemFileUtil {
  public:
-  static QuotaFileUtil* GetInstance();
-  virtual ~QuotaFileUtil() {}
+  static const int64 kNoLimit;

[kinuko, 2011/07/26 09:48:57]

style-nit: place variables after methods

[Dai Mikurube (NOT FULLTIME), 2011/07/26 10:19:11]

I remember Constants (static const) are better to be located before methods.

 
-  static const int64 kNoLimit;
+  // |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 QuotaFileUtil(new FileSystemFileUtil());
+  explicit QuotaFileUtil(FileSystemFileUtil* underlying_file_util);
+  virtual ~QuotaFileUtil();
+
+  static QuotaFileUtil* CreateDefault();

[kinuko, 2011/07/26 09:48:57]

Please add comment about what this does.  The comment above says this can be
instantiated by 'new' operator while we have static Create method, which would
confuse the reader.

[Dai Mikurube (NOT FULLTIME), 2011/07/26 10:19:11]

Done.

 
   // TODO(dmikurube): Make this function variable by the constructor.
   int64 ComputeFilePathCost(const FilePath& file_path) const;
 
   virtual base::PlatformFileError CreateOrOpen(
       FileSystemOperationContext* fs_context,
       const FilePath& file_path, int file_flags,
       PlatformFile* file_handle, bool* created) OVERRIDE;
 
   virtual base::PlatformFileError EnsureFileExists(
@@ skipping 19 matching lines @@
 
   virtual base::PlatformFileError DeleteSingleDirectory(
       FileSystemOperationContext* fs_context,
       const FilePath& file_path) OVERRIDE;
 
   virtual base::PlatformFileError Truncate(
       FileSystemOperationContext* fs_context,
       const FilePath& path,
       int64 length) OVERRIDE;
 
-  friend struct DefaultSingletonTraits<QuotaFileUtil>;
-  DISALLOW_COPY_AND_ASSIGN(QuotaFileUtil);
+ private:
+  scoped_ptr<FileSystemFileUtil> underlying_file_util_;
 
- protected:
-  QuotaFileUtil() {}
-
- private:
   // TODO(dmikurube): Make these constants variable by the constructor.
   //
   // These values are based on Obfuscation DB.  See crbug.com/86114 for the
   // source of these numbers.  These should be revisited if
   // * the underlying tables change,
   // * indexes in levelDB change, or
   // * another path name indexer is provided in addition to levelDB.
   //
   // When these values are changed, the usage cache should be bumped up.
   static const int64 kFilePathCostPerChar;
   static const int64 kFilePathCostPerFile;
 
   bool CanCopyFile(
       FileSystemOperationContext* fs_context,
       const FilePath& src_file_path,
       const FilePath& dest_file_path,
       int64 allowed_bytes_growth,
       int64* growth) const;
+
+  DISALLOW_COPY_AND_ASSIGN(QuotaFileUtil);
 };
 
 }  // namespace fileapi
 
 #endif  // WEBKIT_FILEAPI_QUOTA_FILE_UTIL_H_