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;
 
+// An instance of this class is created and owned by *MountPointProvider.
 class LocalFileSystemFileUtil : public FileSystemFileUtil {
  public:
-  static LocalFileSystemFileUtil* GetInstance();
+  // |underlying_file_util| is not owned by the instance.  It will need to be
+  // a singleton or to be deleted by someone else.
+  explicit LocalFileSystemFileUtil(FileSystemFileUtil* underlying_file_util);
 
   virtual PlatformFileError CreateOrOpen(
       FileSystemOperationContext* context,
       const FilePath& file_path,
       int file_flags,
       PlatformFile* file_handle,
       bool* created);
 
   virtual PlatformFileError EnsureFileExists(
       FileSystemOperationContext* context,
@@ skipping 60 matching lines @@
       const FilePath& file_path);
 
   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_;
+
+  DISALLOW_COPY_AND_ASSIGN(LocalFileSystemFileUtil);
 };
 
 }  // namespace fileapi
 
 #endif  // WEBKIT_FILEAPI_LOCAL_FILE_SYSTEM_FILE_UTIL_H_