Cleanup: Remove FileSystemFileUtil::{Directory,Path}Exists

webkit/fileapi/local_file_system_quota_unittest.cc

 // Copyright (c) 2012 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/bind.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop.h"
 #include "base/platform_file.h"
 #include "base/scoped_temp_dir.h"
 #include "base/string_number_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/fileapi/file_system_usage_cache.h"
 #include "webkit/fileapi/file_system_util.h"
+#include "webkit/fileapi/file_util_helper.h"
 #include "webkit/fileapi/local_file_system_operation.h"
 #include "webkit/fileapi/local_file_system_test_helper.h"
 #include "webkit/quota/quota_manager.h"
 
 namespace fileapi {
 
 const int kFileOperationStatusNotSet = 1;
 
 namespace {
 
 void AssertFileErrorEq(base::PlatformFileError expected,
                        base::PlatformFileError actual) {
   ASSERT_EQ(expected, actual);
 }
 
-} // namespace
+}  // namespace
 
 class LocalFileSystemQuotaTest
     : public testing::Test,
       public base::SupportsWeakPtr<LocalFileSystemQuotaTest> {
  public:
   LocalFileSystemQuotaTest()
       : weak_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)),
         next_unique_path_suffix_(0),
         status_(kFileOperationStatusNotSet),
         quota_status_(quota::kQuotaStatusUnknown),
@@ skipping 47 matching lines @@
     quota_manager_->GetUsageAndQuota(
         test_helper_.origin(), test_helper_.storage_type(),
         base::Bind(&LocalFileSystemQuotaTest::OnGetUsageAndQuota,
                    weak_factory_.GetWeakPtr()));
     MessageLoop::current()->RunAllPending();
   }
 
   bool FileExists(const FilePath& virtual_path) {
     FileSystemURL path = test_helper_.CreateURL(virtual_path);
     scoped_ptr<FileSystemOperationContext> context(NewContext());
-    return file_util()->PathExists(context.get(), path);
+    return FileUtilHelper::PathExists(context.get(), file_util(), path);
   }
 
   bool DirectoryExists(const FilePath& virtual_path) {
     FileSystemURL path = test_helper_.CreateURL(virtual_path);
     scoped_ptr<FileSystemOperationContext> context(NewContext());
-    return file_util()->DirectoryExists(context.get(), path);
+    return FileUtilHelper::DirectoryExists(context.get(), file_util(), path);
   }
 
   FilePath CreateUniqueFileInDir(const FilePath& virtual_dir_path) {
     FilePath file_name = FilePath::FromUTF8Unsafe(
         "tmpfile-" + base::IntToString(next_unique_path_suffix_++));
     FileSystemURL url = test_helper_.CreateURL(
         virtual_dir_path.Append(file_name));
 
     scoped_ptr<FileSystemOperationContext> context(NewContext());
     bool created;
@@ skipping 218 matching lines @@
 
   EXPECT_EQ(2 * child_file_size + 3 * grandchild_file_size, ActualFileSize());
   EXPECT_EQ(expected_usage, SizeByQuotaUtil());
   GetUsageAndQuotaFromQuotaManager();
   EXPECT_EQ(quota::kQuotaStatusOk, quota_status());
   EXPECT_EQ(expected_usage, usage());
   ASSERT_LT(expected_usage, quota());
 }
 
 }  // namespace fileapi