Refactoring: Change all -FileUtils non-Singleton and to own underlying FileUtils.

webkit/fileapi/file_writer_delegate_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 64 matching lines @@
  public:
   FileWriterDelegateTest()
       : loop_(MessageLoop::TYPE_IO),
         file_(base::kInvalidPlatformFileValue) {}
 
  protected:
   virtual void SetUp();
   virtual void TearDown();
 
   virtual void SetUpTestHelper(const FilePath& base_dir) {
-    test_helper_.SetUp(base_dir, QuotaFileUtil::GetInstance());
+    quota_file_util_.reset(QuotaFileUtil::CreateDefault());
+    test_helper_.SetUp(base_dir, quota_file_util_.get());
   }
 
   int64 ComputeCurrentOriginUsage() {
     base::FlushPlatformFile(file_);
     return test_helper_.ComputeCurrentOriginUsage();
   }
 
   // Creates and sets up a FileWriterDelegate for writing the given |blob_url|
   // to a file (file_) from |offset| with |allowed_growth| quota setting.
   void PrepareForWrite(const GURL& blob_url,
@@ skipping 12 matching lines @@
     file_writer_delegate_.reset(new FileWriterDelegate(
         CreateNewOperation(result_.get(), allowed_growth),
         offset, base::MessageLoopProxy::CreateForCurrentThread()));
     request_.reset(new net::URLRequest(blob_url, file_writer_delegate_.get()));
   }
 
   FileSystemOperation* CreateNewOperation(Result* result, int64 quota);
 
   static net::URLRequest::ProtocolFactory Factory;
 
+  scoped_ptr<QuotaFileUtil> quota_file_util_;
   scoped_ptr<FileWriterDelegate> file_writer_delegate_;
   scoped_ptr<net::URLRequest> request_;
   scoped_ptr<Result> result_;
   FileSystemTestOriginHelper test_helper_;
 
   MessageLoop loop_;
   ScopedTempDir dir_;
   FilePath file_path_;
   PlatformFile file_;
 
@@ skipping 345 matching lines @@
   EXPECT_EQ(base::PLATFORM_FILE_ERROR_NO_SPACE, result_->status());
   EXPECT_TRUE(result_->complete());
 }
 
 class FileWriterDelegateUnlimitedTest : public FileWriterDelegateTest {
  protected:
   virtual void SetUpTestHelper(const FilePath& path) OVERRIDE;
 };
 
 void FileWriterDelegateUnlimitedTest::SetUpTestHelper(const FilePath& path) {
+  quota_file_util_.reset(QuotaFileUtil::CreateDefault());
   test_helper_.SetUp(
       path,
       false /* incognito */,
       true /* unlimited */,
       NULL /* quota manager proxy */,
-      QuotaFileUtil::GetInstance());
+      quota_file_util_.get());
 }
 
 TEST_F(FileWriterDelegateUnlimitedTest, WriteWithQuota) {
   const GURL kBlobURL("blob:with-unlimited");
   content_ = kData;
 
   // Set small allowed_growth bytes
   PrepareForWrite(kBlobURL, 0, 10);
 
   // We shouldn't fail as the context is configured as 'unlimited'.
   file_writer_delegate_->Start(file_, request_.get());
   MessageLoop::current()->Run();
   EXPECT_EQ(kDataSize + FileSystemUsageCache::kUsageFileSize,
             test_helper_.GetCachedOriginUsage());
   EXPECT_EQ(ComputeCurrentOriginUsage() + FileSystemUsageCache::kUsageFileSize,
             test_helper_.GetCachedOriginUsage());
   EXPECT_EQ(kDataSize, result_->bytes_written());
   EXPECT_EQ(base::PLATFORM_FILE_OK, result_->status());
   EXPECT_TRUE(result_->complete());
 }
 
 }  // namespace fileapi