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

webkit/fileapi/file_system_operation_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.
 
 #include "webkit/fileapi/file_system_operation.h"
 
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
@@ skipping 230 matching lines @@
 
   FileSystemTestOriginHelper test_helper_;
 
   // For post-operation status.
   int status_;
   base::PlatformFileInfo info_;
   FilePath path_;
   std::vector<base::FileUtilProxy::Entry> entries_;
 
  private:
+  scoped_ptr<LocalFileSystemFileUtil> local_file_util_;
   scoped_refptr<QuotaManager> quota_manager_;
   scoped_refptr<QuotaManagerProxy> quota_manager_proxy_;
   DISALLOW_COPY_AND_ASSIGN(FileSystemOperationTest);
 };
 
 namespace {
 
 class MockDispatcher : public FileSystemCallbackDispatcher {
  public:
   explicit MockDispatcher(FileSystemOperationTest* test) : test_(test) { }
@@ skipping 29 matching lines @@
   }
 
  private:
   FileSystemOperationTest* test_;
 };
 
 }  // namespace (anonymous)
 
 void FileSystemOperationTest::SetUp() {
   FilePath base_dir = base_.path().AppendASCII("filesystem");
+  local_file_util_.reset(
+      new LocalFileSystemFileUtil(QuotaFileUtil::GetInstance()));
   quota_manager_ = new MockQuotaManager(
       base_dir, test_helper_.origin(), test_helper_.storage_type());
   quota_manager_proxy_ = new MockQuotaManagerProxy(quota_manager_.get());
   test_helper_.SetUp(base_dir,
                      false /* incognito */,
                      false /* unlimited quota */,
                      quota_manager_proxy_.get(),
-                     LocalFileSystemFileUtil::GetInstance());
+                     local_file_util_.get());
 }
 
 void FileSystemOperationTest::TearDown() {
   // Let the client go away before dropping a ref of the quota manager proxy.
   quota_manager_proxy()->SimulateQuotaManagerDestroyed();
   quota_manager_ = NULL;
   quota_manager_proxy_ = NULL;
   test_helper_.TearDown();
+  local_file_util_.reset();
 }
 
 FileSystemOperation* FileSystemOperationTest::operation() {
   return test_helper_.NewOperation(new MockDispatcher(this));
 }
 
 TEST_F(FileSystemOperationTest, TestMoveFailureSrcDoesntExist) {
   GURL src(URLForPath(FilePath(FILE_PATH_LITERAL("a"))));
   GURL dest(URLForPath(FilePath(FILE_PATH_LITERAL("b"))));
   operation()->Move(src, dest);
@@ skipping 621 matching lines @@
 
   operation()->Truncate(URLForPath(file_path), 11);
   MessageLoop::current()->RunAllPending();
   EXPECT_EQ(base::PLATFORM_FILE_ERROR_NO_SPACE, status());
 
   EXPECT_TRUE(file_util::GetFileInfo(PlatformPath(file_path), &info));
   EXPECT_EQ(10, info.size);
 }
 
 }  // namespace fileapi