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

webkit/fileapi/file_system_operation_write_unittest.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.
 //
 // NOTE: These tests are run as part of "unit_tests" (in chrome/test/unit)
 // rather than as part of test_shell_tests because they rely on being able
 // to instantiate a MessageLoop of type TYPE_IO.  test_shell_tests uses
 // TYPE_UI, which URLRequest doesn't allow.
 //
 
@@ skipping 11 matching lines @@
 #include "webkit/blob/blob_storage_controller.h"
 #include "webkit/blob/blob_url_request_job.h"
 #include "webkit/fileapi/file_system_callback_dispatcher.h"
 #include "webkit/fileapi/file_system_context.h"
 #include "webkit/fileapi/file_system_file_util.h"
 #include "webkit/fileapi/file_system_operation.h"
 #include "webkit/fileapi/file_system_path_manager.h"
 #include "webkit/fileapi/file_system_test_helper.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/quota/quota_manager.h"
 
 using quota::QuotaManager;
 
 namespace fileapi {
 
 namespace {
 
 class MockQuotaManager : public QuotaManager {
  public:
@@ skipping 48 matching lines @@
   bool complete() const { return complete_; }
 
   virtual void SetUp();
   virtual void TearDown();
 
  protected:
   GURL URLForPath(const FilePath& path) const {
     return test_helper_.GetURLForPath(path);
   }
 
+  scoped_ptr<LocalFileSystemFileUtil> local_file_util_;
   scoped_refptr<MockQuotaManager> quota_manager_;
   FileSystemTestOriginHelper test_helper_;
 
   MessageLoop loop_;
 
   ScopedTempDir dir_;
   FilePath filesystem_dir_;
   FilePath file_;
   FilePath virtual_path_;
 
@@ skipping 66 matching lines @@
  private:
   FileSystemOperationWriteTest* test_;
 };
 
 }  // namespace (anonymous)
 
 void FileSystemOperationWriteTest::SetUp() {
   ASSERT_TRUE(dir_.CreateUniqueTempDir());
   FilePath base_dir = dir_.path().AppendASCII("filesystem");
 
+  local_file_util_.reset(
+      new LocalFileSystemFileUtil(QuotaFileUtil::GetInstance()));
   quota_manager_ = new MockQuotaManager(base_dir, 1024);
   test_helper_.SetUp(base_dir,
                      false /* incognito */,
                      false /* unlimited quota */,
                      quota_manager_->proxy(),
-                     LocalFileSystemFileUtil::GetInstance());
+                     local_file_util_.get());
   filesystem_dir_ = test_helper_.GetOriginRootPath();
 
   ASSERT_TRUE(file_util::CreateTemporaryFileInDir(filesystem_dir_, &file_));
   virtual_path_ = file_.BaseName();
 
   net::URLRequest::RegisterProtocolFactory("blob", &BlobURLRequestJobFactory);
 }
 
 void FileSystemOperationWriteTest::TearDown() {
   net::URLRequest::RegisterProtocolFactory("blob", NULL);
   quota_manager_ = NULL;
   test_helper_.TearDown();
+  local_file_util_.reset();
 }
 
 FileSystemOperation* FileSystemOperationWriteTest::operation() {
   return test_helper_.NewOperation(new MockDispatcher(this));
 }
 
 TEST_F(FileSystemOperationWriteTest, TestWriteSuccess) {
   GURL blob_url("blob:success");
   scoped_refptr<webkit_blob::BlobData> blob_data(new webkit_blob::BlobData());
   blob_data->AppendData("Hello, world!\n");
@@ skipping 115 matching lines @@
   url_request_context->blob_storage_controller()->UnregisterBlobUrl(blob_url);
 
   EXPECT_EQ(10, bytes_written());
   EXPECT_EQ(base::PLATFORM_FILE_ERROR_NO_SPACE, status());
   EXPECT_TRUE(complete());
 }
 
 // TODO(ericu,dmikurube): Add tests for Cancel.
 
 }  // namespace fileapi