Change {Obfuscated|Local}FileSystemFileUtil non-Singleton to take an underlying *FileUtil.

webkit/fileapi/local_file_system_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_LOCAL_FILE_SYSTEM_FILE_UTIL_H_
 #define WEBKIT_FILEAPI_LOCAL_FILE_SYSTEM_FILE_UTIL_H_
 
 #include <vector>
 
 #include "base/callback.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/file_util_proxy.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
-#include "base/memory/singleton.h"
 #include "base/platform_file.h"
 #include "base/tracked_objects.h"
 #include "webkit/fileapi/file_system_file_util.h"
 #include "webkit/fileapi/file_system_types.h"
 
 namespace base {
 struct PlatformFileInfo;
 class MessageLoopProxy;
 class Time;
 }
 
 class GURL;
 
 namespace fileapi {
 
 using base::PlatformFile;
 using base::PlatformFileError;
 
 class FileSystemOperationContext;
 
 class LocalFileSystemFileUtil : public FileSystemFileUtil {
  public:
-  static LocalFileSystemFileUtil* GetInstance();
+  explicit LocalFileSystemFileUtil(FileSystemFileUtil* underlying_file_util);

[kinuko, 2011/07/01 07:48:02]

I'm a bit concerned about this asymmetry-- if I read the code correctly some of
FSFUs are singletons but some are not right?  It's not very obvious whether a
FSFU pointer owner should call delete or not.  Now that we only create FSFU
instances per mount point, maybe we can turn all of the FSFU non-singleton?

[Dai Mikurube (NOT FULLTIME), 2011/07/04 06:14:53]

Yeah, I have the same concern.  ObfuscatedFSFU, however, has been already not
singleton -- asymmetric.

I'm planning to make the other FSFUs non-singleton in another change since they
might effect larger part.

[kinuko, 2011/07/05 03:13:02]

Ok.  Let me make sure, after this change only the 'top-level' FSFUs, which are
directly created by and owned by MountProviders will be non-singleton. Correct?

Could you add a comment to this class about who creates and owns an instance of
this class?
Also let's explicitly note that the |underlying_file_util| is *not* owned by
this instance and will need to be a singleton or to be deleted someone else. 
(Same for the constructor of obfuscatedFSFU's parameter)

[Dai Mikurube (NOT FULLTIME), 2011/07/05 05:30:11]

Ok, added comments on {Local|Obfuscated}FileSystemFileUtil.  Could you take a
look at this?

 
   virtual PlatformFileError CreateOrOpen(
       FileSystemOperationContext* context,
       const FilePath& file_path,
       int file_flags,
       PlatformFile* file_handle,
       bool* created);
 
   virtual PlatformFileError EnsureFileExists(
       FileSystemOperationContext* context,
@@ skipping 61 matching lines @@
 
   virtual bool IsDirectoryEmpty(
       FileSystemOperationContext* context,
       const FilePath& file_path);
 
   virtual AbstractFileEnumerator* CreateFileEnumerator(
       FileSystemOperationContext* context,
       const FilePath& root_path);
 
  protected:
-  LocalFileSystemFileUtil() { }
-
-  friend struct DefaultSingletonTraits<LocalFileSystemFileUtil>;
   DISALLOW_COPY_AND_ASSIGN(LocalFileSystemFileUtil);
 
  private:
   // Given the filesystem's root URL and a virtual path, produces a real, full
   // local path.
   FilePath GetLocalPath(
       FileSystemOperationContext* context,
       const GURL& origin_url,
       FileSystemType type,
       const FilePath& virtual_path);
+
+  FileSystemFileUtil* underlying_file_util_;
 };
 
 }  // namespace fileapi
 
 #endif  // WEBKIT_FILEAPI_LOCAL_FILE_SYSTEM_FILE_UTIL_H_