Add FileUtileHelper

webkit/fileapi/cross_file_util_helper.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/cross_file_util_helper.h"
 
 #include "webkit/fileapi/file_system_file_util.h"
 #include "webkit/fileapi/file_system_operation_context.h"
 #include "webkit/fileapi/file_system_path.h"
+#include "webkit/fileapi/file_util_helper.h"
 
 using base::PlatformFileError;
 
 namespace fileapi {
 
 CrossFileUtilHelper::CrossFileUtilHelper(
     FileSystemOperationContext* context,
     FileSystemFileUtil* src_util,
     FileSystemFileUtil* dest_util,
     const FileSystemPath& src_path,
@@ skipping 56 matching lines @@
   if (same_file_system && (src_root_path_.internal_path() ==
                            dest_root_path_.internal_path()))
     return base::PLATFORM_FILE_ERROR_EXISTS;
 
   if (dest_is_directory) {
     // It is an error to copy/move an entry to a non-empty directory.
     // Otherwise the copy/move attempt must overwrite the destination, but
     // the file_util's Copy or Move method doesn't perform overwrite
     // on all platforms, so we delete the destination directory here.
     if (base::PLATFORM_FILE_OK !=
-        dest_util_->Delete(context_, dest_root_path_, false /* recursive */)) {
+        dest_util_->DeleteSingleDirectory(context_, dest_root_path_)) {
       if (!dest_util_->IsDirectoryEmpty(context_, dest_root_path_))
         return base::PLATFORM_FILE_ERROR_NOT_EMPTY;
       return base::PLATFORM_FILE_ERROR_FAILED;
     }
   }
   return base::PLATFORM_FILE_OK;
 }
 
 bool CrossFileUtilHelper::ParentExists(
     const FileSystemPath& path, FileSystemFileUtil* file_util) {
@@ skipping 38 matching lines @@
     } else {
       PlatformFileError error = CopyOrMoveFile(
           src_path.WithInternalPath(src_file_path_each),
           dest_path.WithInternalPath(dest_file_path_each));
       if (error != base::PLATFORM_FILE_OK)
         return error;
     }
   }
 
   if (operation_ == OPERATION_MOVE) {
-    PlatformFileError error = src_util_->Delete(context_, src_path, true);
+    PlatformFileError error =
+        FileUtilHelper::Delete(context_, src_util_,
+                               src_path, true /* recursive */);
     if (error != base::PLATFORM_FILE_OK)
       return error;
   }
 
   return base::PLATFORM_FILE_OK;
 }
 
 PlatformFileError CrossFileUtilHelper::CopyOrMoveFile(
     const FileSystemPath& src_path,
     const FileSystemPath& dest_path) {
@@ skipping 18 matching lines @@
   // to perform limited cross-FileSystemFileUtil copy/move.
   error = dest_util_->CopyInForeignFile(
       context_, src_path.WithInternalPath(platform_file_path), dest_path);
 
   if (operation_ == OPERATION_COPY || error != base::PLATFORM_FILE_OK)
     return error;
   return src_util_->DeleteFile(context_, src_path);
 }
 
 }  // namespace fileapi