Revert 181278

Build failures. See http://build.chromium.org/p/chromium.webkit/builders/Mac10.6%20Tests/builds/16259/steps/compile/logs/stdio

> Introduce AsyncFileTestHelper for testing with async file/quota operations
> 
> Also gradually deprecate FileUtilHelper since its code is no longer
> used in the actual code path (used only in unittests).
> 
> BUG=146215
> TEST=content_unittests:LocalFileSystem*
> TBR=jam@chromium.org
> 
> Review URL: https://codereview.chromium.org/12223006

TBR=kinuko@chromium.org
Review URL: https://codereview.chromium.org/12221066

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181288 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 40 insertions, 26 deletions

diff --git a/webkit/fileapi/obfuscated_file_util_unittest.cc b/webkit/fileapi/obfuscated_file_util_unittest.cc
index 5c5159f..ef0f2bc 100644
--- a/webkit/fileapi/obfuscated_file_util_unittest.cc
+++ b/webkit/fileapi/obfuscated_file_util_unittest.cc
@@ -14,12 +14,12 @@
 #include "base/message_loop.h"
 #include "base/platform_file.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "webkit/fileapi/async_file_test_helper.h"
 #include "webkit/fileapi/external_mount_points.h"
 #include "webkit/fileapi/file_system_context.h"
 #include "webkit/fileapi/file_system_operation_context.h"
 #include "webkit/fileapi/file_system_task_runners.h"
 #include "webkit/fileapi/file_system_usage_cache.h"
+#include "webkit/fileapi/file_util_helper.h"
 #include "webkit/fileapi/local_file_system_test_helper.h"
 #include "webkit/fileapi/mock_file_change_observer.h"
 #include "webkit/fileapi/mock_file_system_options.h"
@@ -209,10 +209,11 @@ class ObfuscatedFileUtilTest : public testing::Test {
   }
 
   void GetUsageFromQuotaManager() {
-    int64 quota = -1;
-    quota_status_ = AsyncFileTestHelper::GetUsageAndQuota(
-      quota_manager_, origin(), test_helper_.type(),
-      &usage_, &quota);
+    quota_manager_->GetUsageAndQuota(
+      origin(), test_helper_.storage_type(),
+      base::Bind(&ObfuscatedFileUtilTest::OnGetUsage,
+                 weak_factory_.GetWeakPtr()));
+    MessageLoop::current()->RunUntilIdle();
     EXPECT_EQ(quota::kQuotaStatusOk, quota_status_);
   }
 
@@ -240,7 +241,8 @@ class ObfuscatedFileUtilTest : public testing::Test {
   }
 
   bool DirectoryExists(const FileSystemURL& url) {
-    return AsyncFileTestHelper::DirectoryExists(file_system_context(), url);
+    scoped_ptr<FileSystemOperationContext> context(NewContext(NULL));
+    return FileUtilHelper::DirectoryExists(context.get(), ofu(), url);
   }
 
   int64 usage() const { return usage_; }
@@ -257,6 +259,12 @@ class ObfuscatedFileUtilTest : public testing::Test {
     return test_helper_.CreateURL(path);
   }
 
+  void OnGetUsage(quota::QuotaStatusCode status, int64 usage, int64 unused) {
+    EXPECT_EQ(quota::kQuotaStatusOk, status);
+    quota_status_ = status;
+    usage_ = usage;
+  }
+
   void CheckFileAndCloseHandle(
       const FileSystemURL& url, base::PlatformFile file_handle) {
     scoped_ptr<FileSystemOperationContext> context(NewContext(NULL));
@@ -385,10 +393,11 @@ class ObfuscatedFileUtilTest : public testing::Test {
       std::set<base::FilePath::StringType>* files,
       std::set<base::FilePath::StringType>* directories) {
     scoped_ptr<FileSystemOperationContext> context;
+    context.reset(NewContext(NULL));
     std::vector<base::FileUtilProxy::Entry> entries;
     EXPECT_EQ(base::PLATFORM_FILE_OK,
-              AsyncFileTestHelper::ReadDirectory(
-                  file_system_context(), root_url, &entries));
+              FileUtilHelper::ReadDirectory(
+                  context.get(), ofu(), root_url, &entries));
     EXPECT_EQ(0UL, entries.size());
 
     files->clear();
@@ -431,8 +440,8 @@ class ObfuscatedFileUtilTest : public testing::Test {
     std::vector<base::FileUtilProxy::Entry> entries;
     context.reset(NewContext(NULL));
     EXPECT_EQ(base::PLATFORM_FILE_OK,
-              AsyncFileTestHelper::ReadDirectory(
-                  file_system_context(), root_url, &entries));
+              FileUtilHelper::ReadDirectory(
+                  context.get(), ofu(), root_url, &entries));
     std::vector<base::FileUtilProxy::Entry>::iterator entry_iter;
     EXPECT_EQ(files.size() + directories.size(), entries.size());
     EXPECT_TRUE(change_observer()->HasNoChange());
@@ -626,10 +635,6 @@ class ObfuscatedFileUtilTest : public testing::Test {
     return test_helper_;
   }
 
-  FileSystemContext* file_system_context() {
-    return test_helper_.file_system_context();
-  }
-
  private:
   base::ScopedTempDir data_dir_;
   MessageLoop message_loop_;
@@ -1073,10 +1078,11 @@ TEST_F(ObfuscatedFileUtilTest, TestReadDirectoryOnFile) {
       ofu()->EnsureFileExists(context.get(), url, &created));
   ASSERT_TRUE(created);
 
+  context.reset(NewContext(NULL));
   std::vector<base::FileUtilProxy::Entry> entries;
   EXPECT_EQ(base::PLATFORM_FILE_ERROR_NOT_A_DIRECTORY,
-            AsyncFileTestHelper::ReadDirectory(
-                file_system_context(), url, &entries));
+            FileUtilHelper::ReadDirectory(
+                context.get(), ofu(), url, &entries));
 
   EXPECT_TRUE(ofu()->IsDirectoryEmpty(context.get(), url));
 }
@@ -1390,17 +1396,18 @@ TEST_F(ObfuscatedFileUtilTest, TestEnumerator) {
   FileSystemURL dest_url = CreateURLFromUTF8("destination dir");
 
   EXPECT_FALSE(DirectoryExists(dest_url));
+  context.reset(NewContext(NULL));
   ASSERT_EQ(base::PLATFORM_FILE_OK,
-            AsyncFileTestHelper::Copy(
-                test_helper().file_system_context(), src_url, dest_url));
+            test_helper().SameFileUtilCopy(context.get(), src_url, dest_url));
 
   ValidateTestDirectory(dest_url, files, directories);
   EXPECT_TRUE(DirectoryExists(src_url));
   EXPECT_TRUE(DirectoryExists(dest_url));
+  context.reset(NewContext(NULL));
   recursive = true;
   ASSERT_EQ(base::PLATFORM_FILE_OK,
-            AsyncFileTestHelper::Remove(
-                file_system_context(), dest_url, recursive));
+            FileUtilHelper::Delete(context.get(), ofu(),
+                                   dest_url, recursive));
   EXPECT_FALSE(DirectoryExists(dest_url));
 }
 
@@ -1629,21 +1636,24 @@ TEST_F(ObfuscatedFileUtilTest, TestIncompleteDirectoryReading) {
     EXPECT_TRUE(created);
   }
 
+  context.reset(NewContext(NULL));
   std::vector<base::FileUtilProxy::Entry> entries;
   EXPECT_EQ(base::PLATFORM_FILE_OK,
-            AsyncFileTestHelper::ReadDirectory(
-                file_system_context(), empty_path, &entries));
+            FileUtilHelper::ReadDirectory(
+                context.get(), ofu(), empty_path, &entries));
   EXPECT_EQ(3u, entries.size());
 
+  context.reset(NewContext(NULL));
   base::FilePath local_path;
   EXPECT_EQ(base::PLATFORM_FILE_OK,
             ofu()->GetLocalFilePath(context.get(), kPath[0], &local_path));
   EXPECT_TRUE(file_util::Delete(local_path, false));
 
+  context.reset(NewContext(NULL));
   entries.clear();
   EXPECT_EQ(base::PLATFORM_FILE_OK,
-            AsyncFileTestHelper::ReadDirectory(
-                file_system_context(), empty_path, &entries));
+            FileUtilHelper::ReadDirectory(
+                context.get(), ofu(), empty_path, &entries));
   EXPECT_EQ(ARRAYSIZE_UNSAFE(kPath) - 1, entries.size());
 }
 
@@ -2159,8 +2169,12 @@ TEST_F(ObfuscatedFileUtilTest, TestQuotaOnRemove) {
   ASSERT_EQ(1140, ComputeTotalFileSize());
 
   ASSERT_EQ(base::PLATFORM_FILE_OK,
-            AsyncFileTestHelper::Remove(
-                file_system_context(), dir, true /* recursive */));
+            FileUtilHelper::Delete(
+                AllowUsageIncrease(-PathCost(dir) -
+                                   PathCost(dfile1) -
+                                   PathCost(dfile2) -
+                                   1020 - 120)->context(),
+                ofu(), dir, true));
   ASSERT_EQ(0, ComputeTotalFileSize());
 }