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

webkit/fileapi/file_system_path_manager.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_path_manager.h"
 
 #include "base/rand_util.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/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "googleurl/src/gurl.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFileSystem.h"
 #include "webkit/fileapi/file_system_util.h"
-#include "webkit/fileapi/local_file_system_file_util.h"
 #include "webkit/fileapi/sandbox_mount_point_provider.h"
 #include "webkit/glue/webkit_glue.h"
 
 #if defined(OS_CHROMEOS)
 #include "webkit/chromeos/fileapi/cros_mount_point_provider.h"
 #endif
 
 // We use some of WebKit types for conversions between origin identifiers
 // and origin URLs.
 using WebKit::WebFileSystem;
@@ skipping 132 matching lines @@
   return true;
 }
 
 FileSystemFileUtil* FileSystemPathManager::GetFileSystemFileUtil(
     FileSystemType type) const {
   switch (type) {
     case kFileSystemTypeTemporary:
     case kFileSystemTypePersistent:
       return sandbox_provider_->GetFileSystemFileUtil();
     case kFileSystemTypeExternal:
-      return LocalFileSystemFileUtil::GetInstance();
+      if (external_provider_.get()) {
+        return external_provider_->GetFileSystemFileUtil();
+      } else {
+        NOTREACHED();
+        return NULL;
+      }
     case kFileSystemTypeUnknown:
     default:
       NOTREACHED();
       return NULL;
   }
 }
 
 }  // namespace fileapi
 
 COMPILE_ASSERT(int(WebFileSystem::TypeTemporary) == \
                int(fileapi::kFileSystemTypeTemporary), mismatching_enums);
 COMPILE_ASSERT(int(WebFileSystem::TypePersistent) == \
                int(fileapi::kFileSystemTypePersistent), mismatching_enums);
 COMPILE_ASSERT(int(WebFileSystem::TypeExternal) == \
                int(fileapi::kFileSystemTypeExternal), mismatching_enums);