Add FileUtileHelper

webkit/fileapi/obfuscated_file_util_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 <algorithm>
 #include <set>
 #include <string>
 
 #include "base/bind.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/platform_file.h"
 #include "base/scoped_temp_dir.h"
 #include "base/sys_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/fileapi/file_system_context.h"
 #include "webkit/fileapi/file_system_operation_context.h"
 #include "webkit/fileapi/file_system_test_helper.h"
 #include "webkit/fileapi/file_system_usage_cache.h"
+#include "webkit/fileapi/file_util_helper.h"
 #include "webkit/fileapi/mock_file_system_options.h"
 #include "webkit/fileapi/obfuscated_file_util.h"
 #include "webkit/fileapi/test_file_set.h"
 #include "webkit/quota/mock_special_storage_policy.h"
 #include "webkit/quota/quota_manager.h"
 #include "webkit/quota/quota_types.h"
 
 using namespace fileapi;
 
 namespace {
@@ skipping 1144 matching lines @@
             test_helper().SameFileUtilCopy(context.get(), src_path, dest_path));
 
   ValidateTestDirectory(dest_path, files, directories);
   context.reset(NewContext(NULL));
   EXPECT_TRUE(ofu()->DirectoryExists(context.get(), src_path));
   context.reset(NewContext(NULL));
   EXPECT_TRUE(ofu()->DirectoryExists(context.get(), dest_path));
   context.reset(NewContext(NULL));
   recursive = true;
   ASSERT_EQ(base::PLATFORM_FILE_OK,
-      ofu()->Delete(context.get(), dest_path, recursive));
+            FileUtilHelper::DeletePath(context.get(), ofu(),
+                                       dest_path, recursive));
   context.reset(NewContext(NULL));
   EXPECT_FALSE(ofu()->DirectoryExists(context.get(), dest_path));
 }
 
 TEST_F(ObfuscatedFileUtilTest, TestMigration) {
   ScopedTempDir source_dir;
   ASSERT_TRUE(source_dir.CreateUniqueTempDir());
   FilePath root_path = source_dir.path().AppendASCII("chrome-pLmnMWXE7NzTFRsn");
   ASSERT_TRUE(file_util::CreateDirectory(root_path));
 
@@ skipping 467 matching lines @@
 TEST_F(ObfuscatedFileUtilTest, TestDirectoryTimestampForCopyAndMove) {
   TestDirectoryTimestampHelper(
       CreatePathFromUTF8("copy overwrite"), true, true);
   TestDirectoryTimestampHelper(
       CreatePathFromUTF8("copy non-overwrite"), true, false);
   TestDirectoryTimestampHelper(
       CreatePathFromUTF8("move overwrite"), false, true);
   TestDirectoryTimestampHelper(
       CreatePathFromUTF8("move non-overwrite"), false, false);
 }