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

webkit/fileapi/sandbox_mount_point_provider_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.
 
 #include "webkit/fileapi/sandbox_mount_point_provider.h"
 
 #include <set>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop.h"
 #include "base/message_loop_proxy.h"
 #include "base/platform_file.h"
 #include "base/scoped_temp_dir.h"
 #include "googleurl/src/gurl.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/fileapi/file_system_context.h"
 #include "webkit/fileapi/file_system_mount_point_provider.h"
 #include "webkit/fileapi/file_system_operation_context.h"
 #include "webkit/fileapi/file_system_task_runners.h"
 #include "webkit/fileapi/file_system_util.h"
+#include "webkit/fileapi/file_util_helper.h"
 #include "webkit/fileapi/mock_file_system_options.h"
 #include "webkit/quota/mock_special_storage_policy.h"
 
 namespace fileapi {
 
 class SandboxMountPointProviderOriginEnumeratorTest : public testing::Test {
  public:
   void SetUp() {
     ASSERT_TRUE(data_dir_.CreateUniqueTempDir());
     sandbox_provider_.reset(
@@ skipping 157 matching lines @@
     EnsureFileExists(
         root.AppendASCII(seed).AppendASCII("d 0").AppendASCII("file 1"));
     EnsureFileExists(
         root.AppendASCII(seed).AppendASCII("d 0").AppendASCII("file 2"));
   }
 
   FileSystemOperationContext* NewContext() {
     return new FileSystemOperationContext(file_system_context_);
   }
 
+  bool PathExists(const FileSystemURL& url) {
+    scoped_ptr<FileSystemOperationContext> context(NewContext());
+    return FileUtilHelper::PathExists(context.get(), file_util(), url);
+  }
+
+  bool DirectoryExists(const FileSystemURL& url) {
+    scoped_ptr<FileSystemOperationContext> context(NewContext());
+    return FileUtilHelper::DirectoryExists(context.get(), file_util(), url);
+  }
+
   std::string URLAndTypeToSeedString(const GURL& origin_url,
     fileapi::FileSystemType type) {
     return GetOriginIdentifierFromURL(origin_url) +
         GetFileSystemTypeString(type);
   }
 
   void ValidateDataInNewFileSystem(
       const GURL& origin_url, fileapi::FileSystemType type) {
     scoped_ptr<FileSystemOperationContext> context;
     FilePath seed_file_path = FilePath().AppendASCII(
         URLAndTypeToSeedString(origin_url, type));
 
     FileSystemURL root(origin_url, type, FilePath());
     FileSystemURL seed = root.WithPath(root.path().Append(seed_file_path));
 
-    context.reset(NewContext());
-    EXPECT_TRUE(file_util()->DirectoryExists(
-        context.get(), seed));
-    context.reset(NewContext());
-    EXPECT_TRUE(file_util()->DirectoryExists(
-        context.get(), seed.WithPath(seed.path().Append(seed_file_path))));
-    context.reset(NewContext());
-    EXPECT_TRUE(file_util()->DirectoryExists(
-        context.get(), seed.WithPath(seed.path().AppendASCII("d 0"))));
-    context.reset(NewContext());
-    EXPECT_TRUE(file_util()->DirectoryExists(
-        context.get(), seed.WithPath(seed.path().AppendASCII("d 1"))));
-    context.reset(NewContext());
-    EXPECT_TRUE(file_util()->PathExists(
-        context.get(), root.WithPath(root.path().AppendASCII("file 0"))));
-    context.reset(NewContext());
-    EXPECT_FALSE(file_util()->DirectoryExists(
-        context.get(), seed.WithPath(seed.path().AppendASCII("file 0"))));
-    context.reset(NewContext());
-    EXPECT_TRUE(file_util()->PathExists(
-        context.get(),
+    EXPECT_TRUE(DirectoryExists(seed));
+    EXPECT_TRUE(DirectoryExists(
+        seed.WithPath(seed.path().Append(seed_file_path))));
+    EXPECT_TRUE(DirectoryExists(
+        seed.WithPath(seed.path().AppendASCII("d 0"))));
+    EXPECT_TRUE(DirectoryExists(
+        seed.WithPath(seed.path().AppendASCII("d 1"))));
+    EXPECT_TRUE(PathExists(
+        root.WithPath(root.path().AppendASCII("file 0"))));
+    EXPECT_FALSE(DirectoryExists(
+        seed.WithPath(seed.path().AppendASCII("file 0"))));
+    EXPECT_TRUE(PathExists(
         seed.WithPath(seed.path().AppendASCII("d 0").AppendASCII("file 1"))));
-    context.reset(NewContext());
-    EXPECT_FALSE(file_util()->DirectoryExists(
-        context.get(),
+    EXPECT_FALSE(DirectoryExists(
         seed.WithPath(seed.path().AppendASCII("d 0").AppendASCII("file 1"))));
-    context.reset(NewContext());
-    EXPECT_TRUE(file_util()->PathExists(
-        context.get(),
+    EXPECT_TRUE(PathExists(
         seed.WithPath(seed.path().AppendASCII("d 0").AppendASCII("file 2"))));
-    context.reset(NewContext());
-    EXPECT_FALSE(file_util()->DirectoryExists(
-        context.get(),
+    EXPECT_FALSE(DirectoryExists(
         seed.WithPath(seed.path().AppendASCII("d 0").AppendASCII("file 2"))));
   }
 
   void RunMigrationTest(int method) {
     for (size_t i = 0; i < arraysize(kMigrationTestRecords); ++i) {
       const MigrationTestCaseRecord& test_case = kMigrationTestRecords[i];
       const GURL& origin_url = test_case.origin;
       ASSERT_TRUE(test_case.has_temporary || test_case.has_persistent);
       if (test_case.has_temporary) {
         FilePath root = sandbox_provider()->OldCreateFileSystemRootPath(
@@ skipping 126 matching lines @@
 
 TEST_F(SandboxMountPointProviderMigrationTest, TestMigrateViaMethod8) {
   RunMigrationTest(8);
 }
 
 TEST_F(SandboxMountPointProviderMigrationTest, TestMigrateViaMethod9) {
   RunMigrationTest(9);
 }
 
 }  // namespace fileapi