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

webkit/fileapi/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 "base/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/platform_file.h"
 #include "base/scoped_temp_dir.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/fileapi/file_system_context.h"
 #include "webkit/fileapi/file_system_operation_context.h"
 #include "webkit/fileapi/file_system_test_helper.h"
-#include "webkit/fileapi/local_file_system_file_util.h"
 #include "webkit/fileapi/obfuscated_file_system_file_util.h"
 
 using namespace fileapi;
 
 namespace {
 
 struct CopyMoveTestCaseRecord {
   bool is_directory;
   const FilePath::CharType path[64];
   int64 data_file_size;
@@ skipping 33 matching lines @@
 class FileSystemFileUtilTest : public testing::Test {
  public:
   FileSystemFileUtilTest() {
   }
 
   void SetUp() {
   }
 
   FileSystemOperationContext* NewContext(FileSystemTestOriginHelper* helper) {
     FileSystemOperationContext* context = helper->NewOperationContext();
-    context->set_allowed_bytes_growth(1024 * 1024);
     return context;
   }
 
   void TestCrossFileSystemCopyMoveHelper(
       const GURL& src_origin, fileapi::FileSystemType src_type,
       const GURL& dest_origin, fileapi::FileSystemType dest_type,
       bool copy) {
     ScopedTempDir base_dir;
     ASSERT_TRUE(base_dir.CreateUniqueTempDir());
     scoped_refptr<ObfuscatedFileSystemFileUtil> file_util(
-        new ObfuscatedFileSystemFileUtil(base_dir.path()));
+        new ObfuscatedFileSystemFileUtil(base_dir.path(),
+                                         FileSystemFileUtil::GetInstance()));
     FileSystemTestOriginHelper src_helper(src_origin, src_type);
     src_helper.SetUp(base_dir.path(),
                      false,  // incognito
                      false,  // unlimited quota
                      NULL,  // quota::QuotaManagerProxy
                      file_util.get());
     FileSystemTestOriginHelper dest_helper(dest_origin, dest_type);
     dest_helper.SetUp(src_helper.file_system_context(), NULL);
 
     // Set up all the source data.
@@ skipping 21 matching lines @@
     // Do the actual copy or move.
     FileSystemContext* file_system_context = dest_helper.file_system_context();
     scoped_ptr<FileSystemOperationContext> copy_context(
         new FileSystemOperationContext(file_system_context, NULL));
     copy_context->set_src_file_system_file_util(file_util);
     copy_context->set_dest_file_system_file_util(file_util);
     copy_context->set_src_origin_url(src_helper.origin());
     copy_context->set_dest_origin_url(dest_helper.origin());
     copy_context->set_src_type(src_helper.type());
     copy_context->set_dest_type(dest_helper.type());
-    copy_context->set_allowed_bytes_growth(1024 * 1024);
 
     if (copy)
       ASSERT_EQ(base::PLATFORM_FILE_OK,
           file_util->Copy(copy_context.get(), test_root, test_root));
     else
       ASSERT_EQ(base::PLATFORM_FILE_OK,
           file_util->Move(copy_context.get(), test_root, test_root));
 
     // Validate that the destination paths are correct.
     for (size_t i = 0; i < arraysize(kCopyMoveTestCases); ++i) {
@@ skipping 65 matching lines @@
   TestCrossFileSystemCopyMoveHelper(src_origin, type, dest_origin, type, false);
 }
 
 TEST_F(FileSystemFileUtilTest, TestCrossFileSystemMoveSameOrigin) {
   GURL origin("http://www.example.com");
   fileapi::FileSystemType src_type = kFileSystemTypePersistent;
   fileapi::FileSystemType dest_type = kFileSystemTypeTemporary;
 
   TestCrossFileSystemCopyMoveHelper(origin, src_type, origin, dest_type, false);
 }