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

chrome/browser/extensions/extension_file_browser_private_api.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 "chrome/browser/extensions/extension_file_browser_private_api.h"
 
 #include "base/base64.h"
 #include "base/command_line.h"
 #include "base/json/json_writer.h"
 #include "base/logging.h"
@@ skipping 29 matching lines @@
 #include "grit/generated_resources.h"
 #include "grit/platform_locale_settings.h"
 #include "webkit/fileapi/file_system_context.h"
 #include "webkit/fileapi/file_system_mount_point_provider.h"
 #include "webkit/fileapi/file_system_operation.h"
 #include "webkit/fileapi/file_system_operation_context.h"
 #include "webkit/fileapi/file_system_path_manager.h"
 #include "webkit/fileapi/file_system_types.h"
 #include "webkit/fileapi/file_system_util.h"
 #include "webkit/fileapi/file_system_file_util.h"
-#include "webkit/fileapi/local_file_system_file_util.h"
 #include "ui/base/l10n/l10n_util.h"
 
 #ifdef OS_CHROMEOS
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #endif
 
 // Error messages.
 const char kFileError[] = "File error %d";
 const char kInvalidFileUrl[] = "Invalid file URL";
 #ifdef OS_CHROMEOS
@@ skipping 583 matching lines @@
     }
 
     FilePath root_path =
         path_manager->ValidateFileSystemRootAndGetPathOnFileThread(
           file_origin_url,
           fileapi::kFileSystemTypeExternal,
           virtual_path,
           false);     // create
     FilePath final_file_path = root_path.Append(virtual_path);
 
+    fileapi::ExternalFileSystemMountPointProvider* external_provider =
+        path_manager->external_provider();
+    if (!external_provider)
+      return false;
+
     // Check if this file system entry exists first.
     base::PlatformFileInfo file_info;
     FilePath platform_path;
     fileapi::FileSystemOperationContext file_system_operation_context(
         profile_->GetFileSystemContext(),
-        fileapi::LocalFileSystemFileUtil::GetInstance());
+        external_provider->GetFileSystemFileUtil());
     if (base::PLATFORM_FILE_OK !=
             fileapi::FileSystemFileUtil::GetInstance()->GetFileInfo(
                 &file_system_operation_context, final_file_path, &file_info,
                 &platform_path)) {
       return false;
     }
 
-    fileapi::ExternalFileSystemMountPointProvider* external_provider =
-        path_manager->external_provider();
-    if (!external_provider)
-      return false;
-
     // TODO(zelidrag): Let's just prevent all symlinks for now. We don't want a
     // USB drive content to point to something in the rest of the file system.
     // Ideally, we should permit symlinks within the boundary of the same
     // virtual mount point.
     if (file_info.is_symbolic_link)
       return false;
 
     // Get task details.
     std::string target_extension_id;
     std::string action_id;
@@ skipping 562 matching lines @@
 #undef SET_STRING
 
   // TODO(serya): Create a new string in .grd file for this one in M13.
   dict->SetString("PREVIEW_IMAGE",
       l10n_util::GetStringUTF16(IDS_CERT_MANAGER_VIEW_CERT_BUTTON));
   dict->SetString("PLAY_MEDIA",
       l10n_util::GetStringUTF16(IDS_CONTENT_CONTEXT_PLAY));
 
   return true;
 }