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

webkit/fileapi/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_FILE_SYSTEM_FILE_UTIL_H_
 #define WEBKIT_FILEAPI_FILE_SYSTEM_FILE_UTIL_H_
 
 #include "base/callback.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/file_util_proxy.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_types.h"
 
 namespace base {
 struct PlatformFileInfo;
 class MessageLoopProxy;
 class Time;
 }
 
@@ skipping 16 matching lines @@
 //  DeleteSingleDirectory, Touch, Truncate, PathExists, DirectoryExists,
 //  IsDirectoryEmpty and CreateFileEnumerator.
 //
 // The methods below (*2) assume the given paths may not be native ones for the
 // host platform.  The subclasses should not override them.  They provide basic
 // meta logic by using other virtual methods.
 //  (*2) All non-virtual methods: Copy, Move, Delete, DeleteDirectoryRecursive,
 //  PerformCommonCheckAndPreparationForMoveAndCopy and CopyOrMoveDirectory.
 class FileSystemFileUtil {
  public:
-  static FileSystemFileUtil* GetInstance();
+  FileSystemFileUtil() {}
+  virtual ~FileSystemFileUtil() {}
 
   // Creates or opens a file with the given flags.  It is invalid to pass NULL
   // for the callback.
   // If PLATFORM_FILE_CREATE is set in |file_flags| it always tries to create
   // a new file at the given |file_path| and calls back with
   // PLATFORM_FILE_ERROR_FILE_EXISTS if the |file_path| already exists.
   virtual PlatformFileError CreateOrOpen(
       FileSystemOperationContext* context,
       const FilePath& file_path,
       int file_flags,
@@ skipping 171 matching lines @@
 
   // Returns a pointer to a new instance of AbstractFileEnumerator which is
   // implemented for each FileUtil subclass. The instance needs to be freed
   // by the caller, and its lifetime should not extend past when the current
   // call returns to the main FILE message loop.
   virtual AbstractFileEnumerator* CreateFileEnumerator(
       FileSystemOperationContext* unused,
       const FilePath& root_path);
 
  protected:
-  FileSystemFileUtil() { }
-  virtual ~FileSystemFileUtil() { }
-
   // Deletes a directory and all entries under the directory.
   //
   // This method is called from Delete.  It internally calls two following
   // virtual methods,
   // - (virtual) DeleteFile to delete files, and
   // - (virtual) DeleteSingleDirectory to delete empty directories after all
   // the files are deleted.
   PlatformFileError DeleteDirectoryRecursive(
       FileSystemOperationContext* context,
       const FilePath& file_path);
@@ skipping 19 matching lines @@
   // Determines whether a simple same-filesystem move or copy can be done.  If
   // so, it delegates to CopyOrMoveFile.  Otherwise it looks up the true
   // platform path of the source file, delegates to CopyInForeignFile, and [for
   // move] calls DeleteFile on the source file.
   PlatformFileError CopyOrMoveFileHelper(
       FileSystemOperationContext* context,
       const FilePath& src_file_path,
       const FilePath& dest_file_path,
       bool copy);
 
-  friend struct DefaultSingletonTraits<FileSystemFileUtil>;
   DISALLOW_COPY_AND_ASSIGN(FileSystemFileUtil);
 };
 
 }  // namespace fileapi
 
 #endif  // WEBKIT_FILEAPI_FILE_SYSTEM_FILE_UTIL_H_