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

webkit/chromeos/fileapi/cros_mount_point_provider.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/chromeos/fileapi/cros_mount_point_provider.h"
 
 #include "base/logging.h"
 #include "base/memory/scoped_callback_factory.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/message_loop_proxy.h"
 #include "base/stringprintf.h"
 #include "base/synchronization/lock.h"
 #include "base/utf_string_conversions.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCString.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFileSystem.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h"
 #include "webkit/chromeos/fileapi/file_access_permissions.h"
+#include "webkit/fileapi/file_system_file_util.h"
 #include "webkit/fileapi/file_system_path_manager.h"
 #include "webkit/fileapi/file_system_util.h"
 #include "webkit/glue/webkit_glue.h"
 
 namespace chromeos {
 
 typedef struct {
   const char* local_root_path;
   const char* web_root_path;
 } FixedExposedPaths;
 
 const char kChromeUIScheme[] = "chrome";
 
 // Top level file system elements exposed in FileAPI in ChromeOS:
 FixedExposedPaths fixed_exposed_paths[] = {
     {"/home/chronos/user/", "Downloads"},
     {"/",                   "media"},
 };
 
 CrosMountPointProvider::CrosMountPointProvider(
     scoped_refptr<quota::SpecialStoragePolicy> special_storage_policy)
     : special_storage_policy_(special_storage_policy),
-      file_access_permissions_(new FileAccessPermissions()) {
+      file_access_permissions_(new FileAccessPermissions()),
+      local_file_util_(new fileapi::LocalFileSystemFileUtil(
+          fileapi::FileSystemFileUtil::GetInstance())) {
   for (size_t i = 0; i < arraysize(fixed_exposed_paths); i++) {
     mount_point_map_.insert(std::pair<std::string, FilePath>(
         std::string(fixed_exposed_paths[i].web_root_path),
         FilePath(std::string(fixed_exposed_paths[i].local_root_path))));
   }
 }
 
 CrosMountPointProvider::~CrosMountPointProvider() {
 }
 
@@ skipping 114 matching lines @@
 std::vector<FilePath> CrosMountPointProvider::GetRootDirectories() const {
   std::vector<FilePath> root_dirs;
   for (MountPointMap::const_iterator iter = mount_point_map_.begin();
        iter != mount_point_map_.end();
        ++iter) {
     root_dirs.push_back(iter->second.Append(iter->first));
   }
   return root_dirs;
 }
 
+fileapi::FileSystemFileUtil* CrosMountPointProvider::GetFileSystemFileUtil() {
+  return local_file_util_.get();
+}
+
 bool CrosMountPointProvider::GetVirtualPath(const FilePath& filesystem_path,
                                            FilePath* virtual_path) {
   for (MountPointMap::const_iterator iter = mount_point_map_.begin();
        iter != mount_point_map_.end();
        ++iter) {
     FilePath mount_prefix = iter->second.Append(iter->first);
     *virtual_path = FilePath(iter->first);
     if (mount_prefix.AppendRelativePath(filesystem_path, virtual_path)) {
       return true;
     }
   }
   return false;
 }
 
 }  // namespace chromeos