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"
@@ skipping 24 matching lines @@
 namespace fileapi {
 
 FileSystemPathManager::FileSystemPathManager(
     scoped_refptr<base::MessageLoopProxy> file_message_loop,
     const FilePath& profile_path,
     scoped_refptr<quota::SpecialStoragePolicy> special_storage_policy,
     bool is_incognito,
     bool allow_file_access_from_files)
     : is_incognito_(is_incognito),
       allow_file_access_from_files_(allow_file_access_from_files),
+      local_file_util_(
+          new LocalFileSystemFileUtil(FileSystemFileUtil::GetInstance())),
       sandbox_provider_(
           new SandboxMountPointProvider(
               ALLOW_THIS_IN_INITIALIZER_LIST(this),
               file_message_loop,
               profile_path)) {
 #if defined(OS_CHROMEOS)
   external_provider_.reset(
       new chromeos::CrosMountPointProvider(special_storage_policy));
 #endif
 }
@@ skipping 106 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();
+      return local_file_util_.get();
     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);