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

webkit/fileapi/file_system_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/file_system_file_util.h"
 
 #include <stack>
 #include <vector>
 
 #include "base/file_util_proxy.h"
-#include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "webkit/fileapi/file_system_operation_context.h"
 
 namespace fileapi {
 
 namespace {
 
 // This assumes that the root exists.
 bool ParentExists(FileSystemOperationContext* context,
     FileSystemFileUtil* file_util, const FilePath& file_path) {
   // If file_path is in the root, file_path.DirName() will be ".",
   // since we use paths with no leading '/'.
   FilePath parent = file_path.DirName();
   if (parent == FilePath(FILE_PATH_LITERAL(".")))
     return true;
   return file_util->DirectoryExists(context, parent);
 }
 
 }  // namespace
 
-// static
-FileSystemFileUtil* FileSystemFileUtil::GetInstance() {
-  return Singleton<FileSystemFileUtil>::get();
-}
-
 PlatformFileError FileSystemFileUtil::CreateOrOpen(
     FileSystemOperationContext* unused,
     const FilePath& file_path, int file_flags,
     PlatformFile* file_handle, bool* created) {
   if (!file_util::DirectoryExists(file_path.DirName())) {
     // If its parent does not exist, should return NOT_FOUND error.
     return base::PLATFORM_FILE_ERROR_NOT_FOUND;
   }
   PlatformFileError error_code = base::PLATFORM_FILE_OK;
   *file_handle = base::CreatePlatformFile(file_path, file_flags,
@@ skipping 507 matching lines @@
 FileSystemFileUtil::CreateFileEnumerator(
     FileSystemOperationContext* unused,
     const FilePath& root_path) {
   return new FileSystemFileEnumerator(
       root_path, true, static_cast<file_util::FileEnumerator::FILE_TYPE>(
       file_util::FileEnumerator::FILES |
       file_util::FileEnumerator::DIRECTORIES));
 }
 
 }  // namespace fileapi