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

webkit/fileapi/local_file_system_file_util_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 <string>
 
 #include "base/file_path.h"
 #include "base/memory/scoped_callback_factory.h"
 #include "base/message_loop_proxy.h"
 #include "base/platform_file.h"
 #include "base/scoped_temp_dir.h"
 #include "base/sys_string_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/fileapi/file_system_context.h"
 #include "webkit/fileapi/file_system_file_util.h"
 #include "webkit/fileapi/file_system_operation_context.h"
 #include "webkit/fileapi/file_system_path_manager.h"
 #include "webkit/fileapi/file_system_test_helper.h"
 #include "webkit/fileapi/file_system_types.h"
 #include "webkit/fileapi/local_file_system_file_util.h"
-#include "webkit/fileapi/quota_file_util.h"
-#include "webkit/quota/quota_manager.h"
 
 namespace fileapi {
 
 // TODO(dmikurube): Cover all public methods in LocalFileSystemFileUtil.
 class LocalFileSystemFileUtilTest : public testing::Test {
  public:
   LocalFileSystemFileUtilTest()
-      : callback_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {
+      : local_file_util_(NULL),
+        callback_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {
   }
 
   void SetUp() {
     ASSERT_TRUE(data_dir_.CreateUniqueTempDir());
+    local_file_util_.reset(
+        new LocalFileSystemFileUtil(FileSystemFileUtil::GetInstance()));
     test_helper_.SetUp(data_dir_.path(), FileUtil());
   }
 
   void TearDown() {
     test_helper_.TearDown();
+    local_file_util_.reset();
   }
 
  protected:
   FileSystemOperationContext* NewContext() {
     FileSystemOperationContext* context = test_helper_.NewOperationContext();
-    context->set_allowed_bytes_growth(QuotaFileUtil::kNoLimit);
     return context;
   }
 
   LocalFileSystemFileUtil* FileUtil() {
-    return LocalFileSystemFileUtil::GetInstance();
+    return local_file_util_.get();
   }
 
   static FilePath Path(const std::string& file_name) {
     return FilePath().AppendASCII(file_name);
   }
 
   FilePath LocalPath(const char *file_name) {
     return test_helper_.GetLocalPathFromASCII(file_name);
   }
 
@@ skipping 26 matching lines @@
 
   base::PlatformFileError EnsureFileExists(const char* file_name,
       bool* created) {
     scoped_ptr<FileSystemOperationContext> context(NewContext());
     return FileUtil()->EnsureFileExists(
         context.get(),
         Path(file_name), created);
   }
 
  private:
+  scoped_ptr<LocalFileSystemFileUtil> local_file_util_;
   ScopedTempDir data_dir_;
   FileSystemTestOriginHelper test_helper_;
 
   base::ScopedCallbackFactory<LocalFileSystemFileUtilTest> callback_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(LocalFileSystemFileUtilTest);
 };
 
 TEST_F(LocalFileSystemFileUtilTest, CreateAndClose) {
   const char *file_name = "test_file";
@@ skipping 158 matching lines @@
   ASSERT_EQ(base::PLATFORM_FILE_OK,
       FileUtil()->Move(context.get(), Path(from_dir), Path(to_dir)));
 
   EXPECT_FALSE(DirectoryExists(from_dir));
   EXPECT_TRUE(DirectoryExists(to_dir));
   EXPECT_TRUE(FileExists(to_file));
   EXPECT_EQ(1020, GetSize(to_file));
 }
 
 }  // namespace fileapi