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

webkit/fileapi/local_file_system_file_util_unittest.cc

Index: webkit/fileapi/local_file_system_file_util_unittest.cc
diff --git a/webkit/fileapi/local_file_system_file_util_unittest.cc b/webkit/fileapi/local_file_system_file_util_unittest.cc
index a446c8744cf140f25f22b38945f914e71cdf4cd5..694d5ee6959b1de01e8aa2612c7715988dfe946c 100644
--- a/webkit/fileapi/local_file_system_file_util_unittest.cc
+++ b/webkit/fileapi/local_file_system_file_util_unittest.cc
@@ -19,8 +19,6 @@
 #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 {
 
@@ -28,27 +26,30 @@ namespace fileapi {
 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) {
@@ -95,6 +96,7 @@ class LocalFileSystemFileUtilTest : public testing::Test {
   }
 
  private:
+  scoped_ptr<LocalFileSystemFileUtil> local_file_util_;
   ScopedTempDir data_dir_;
   FileSystemTestOriginHelper test_helper_;