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

webkit/fileapi/file_system_test_helper.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_test_helper.h"
 
 #include "base/file_util.h"
 #include "base/message_loop.h"
 #include "base/message_loop_proxy.h"
 #include "googleurl/src/gurl.h"
 #include "webkit/fileapi/file_system_context.h"
 #include "webkit/fileapi/file_system_operation.h"
 #include "webkit/fileapi/file_system_operation_context.h"
 #include "webkit/fileapi/file_system_usage_cache.h"
 #include "webkit/fileapi/file_system_util.h"
-#include "webkit/fileapi/local_file_system_file_util.h"
-#include "webkit/fileapi/quota_file_util.h"
 #include "webkit/fileapi/sandbox_mount_point_provider.h"
 #include "webkit/quota/special_storage_policy.h"
 
 namespace fileapi {
 namespace {
 
 class TestSpecialStoragePolicy : public quota::SpecialStoragePolicy {
  public:
   explicit TestSpecialStoragePolicy(bool unlimited_quota)
       : unlimited_quota_(unlimited_quota) {}
@@ skipping 58 matching lines @@
       ->sandbox_provider()->GetUsageCachePathForOriginAndType(origin_, type_);
   FileSystemUsageCache::UpdateUsage(usage_cache_path, 0);
 }
 
 void FileSystemTestOriginHelper::SetUp(
     const FilePath& base_dir,
     bool incognito_mode,
     bool unlimited_quota,
     quota::QuotaManagerProxy* quota_manager_proxy,
     FileSystemFileUtil* file_util) {
-  file_util_ = file_util ? file_util : LocalFileSystemFileUtil::GetInstance();
+  file_util_ = file_util;
   DCHECK(file_util_);
   file_system_context_ = new FileSystemContext(
       base::MessageLoopProxy::CreateForCurrentThread(),
       base::MessageLoopProxy::CreateForCurrentThread(),
       new TestSpecialStoragePolicy(unlimited_quota),
       quota_manager_proxy,
       base_dir,
       incognito_mode,
       true /* allow_file_access_from_files */,
       unlimited_quota,
@@ skipping 93 matching lines @@
 void FileSystemTestOriginHelper::InitializeOperationContext(
     FileSystemOperationContext* context) {
   DCHECK(context);
   context->set_src_origin_url(origin_);
   context->set_src_type(type_);
   context->set_dest_origin_url(origin_);
   context->set_dest_type(type_);
 }
 
 }  // namespace fileapi