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

webkit/fileapi/file_system_quota_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.
 
 // This test checks the entire behavior of FileSystem usage and quota, such as:
 // 1) the actual size of files on disk,
 // 2) the described size in .usage, and
 // 3) the result of QuotaManager::GetUsageAndQuota.
 
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/memory/scoped_callback_factory.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/platform_file.h"
 #include "base/scoped_temp_dir.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/fileapi/file_system_callback_dispatcher.h"
 #include "webkit/fileapi/file_system_operation.h"
 #include "webkit/fileapi/file_system_test_helper.h"
 #include "webkit/fileapi/file_system_usage_cache.h"
 #include "webkit/fileapi/file_system_util.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 {
 
 const int kFileOperationStatusNotSet = 1;
 
 class FileSystemQuotaTest : public testing::Test {
  public:
   FileSystemQuotaTest()
       : callback_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)),
@@ skipping 77 matching lines @@
   FilePath child_file1_path_;
   FilePath child_file2_path_;
   FilePath grandchild_file1_path_;
   FilePath grandchild_file2_path_;
 
  private:
   FileSystemTestOriginHelper test_helper_;
 
   ScopedTempDir work_dir_;
   scoped_refptr<quota::QuotaManager> quota_manager_;
+  scoped_ptr<LocalFileSystemFileUtil> local_file_util_;
 
   base::ScopedCallbackFactory<FileSystemQuotaTest> callback_factory_;
 
   // For post-operation status.
   int status_;
   quota::QuotaStatusCode quota_status_;
   int64 usage_;
   int64 quota_;
 
   DISALLOW_COPY_AND_ASSIGN(FileSystemQuotaTest);
@@ skipping 48 matching lines @@
   FilePath filesystem_dir_path = work_dir_.path().AppendASCII("filesystem");
   file_util::CreateDirectory(filesystem_dir_path);
 
   quota_manager_ = new quota::QuotaManager(
       false /* is_incognito */,
       filesystem_dir_path,
       base::MessageLoopProxy::CreateForCurrentThread(),
       base::MessageLoopProxy::CreateForCurrentThread(),
       NULL);
 
+  local_file_util_.reset(
+      new LocalFileSystemFileUtil(QuotaFileUtil::GetInstance()));
   test_helper_.SetUp(filesystem_dir_path,
                      false /* incognito */,
                      false /* unlimited quota */,
                      quota_manager_->proxy(),
-                     LocalFileSystemFileUtil::GetInstance());
+                     local_file_util_.get());
 }
 
 void FileSystemQuotaTest::TearDown() {
   quota_manager_ = NULL;
   test_helper_.TearDown();
+  local_file_util_.reset();

[ericu, 2011/06/17 20:32:07]

Clearing member scoped_ptrs shouldn't be necessary in destructors unless there's
some sort of a timing requirement based on variable declaration order.  It's
nicely symmetric to have the creation in SetUp and the deletion in TearDown, but
perhaps instead you could create it in the test constructor and not bother to
destroy it manually?

[same in other tests]

[Dai Mikurube (NOT FULLTIME), 2011/06/23 08:13:32]

Done.  local_file_util_ can be instanciated before SetUp().

 }
 
 FileSystemOperation* FileSystemQuotaTest::operation() {
   return test_helper_.NewOperation(new MockDispatcher(this));
 }
 
 void FileSystemQuotaTest::OnGetUsageAndQuota(
     quota::QuotaStatusCode status, int64 usage, int64 quota) {
   quota_status_ = status;
   usage_ = usage;
@@ skipping 108 matching lines @@
   EXPECT_EQ(2 * child_file_size + 3 * grandchild_file_size + usage_file_size,
       SizeInUsageFile());
   GetUsageAndQuotaFromQuotaManager();
   EXPECT_EQ(quota::kQuotaStatusOk, quota_status());
   EXPECT_EQ(2 * child_file_size + 3 * grandchild_file_size + usage_file_size,
       usage());
   ASSERT_LT(2 * child_file_size + 3 * grandchild_file_size, quota());
 }
 
 }  // namespace fileapi