Cleanup: Move more recursive operation logic from FileUtilHelper to FileUtil

webkit/fileapi/media/device_media_file_util.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/media/device_media_file_util.h"
 
 #include "base/file_util.h"
 #include "base/message_loop_proxy.h"
 #include "webkit/fileapi/file_system_operation_context.h"
 #include "webkit/fileapi/file_system_url.h"
@@ skipping 52 matching lines @@
     bool exclusive,
     bool recursive) {
   return base::PLATFORM_FILE_ERROR_SECURITY;
 }
 
 PlatformFileError DeviceMediaFileUtil::GetFileInfo(
     FileSystemOperationContext* context,
     const FileSystemURL& url,
     PlatformFileInfo* file_info,
     FilePath* platform_path) {
+  DCHECK(file_info);
   MTPDeviceDelegate* delegate = GetMTPDeviceDelegate(context);
   if (!delegate)
     return base::PLATFORM_FILE_ERROR_NOT_FOUND;
 
   PlatformFileError error = delegate->GetFileInfo(url.path(), file_info);
   if (error != base::PLATFORM_FILE_OK)
     return error;
+  if (file_info->is_directory)
+    return base::PLATFORM_FILE_ERROR_NOT_A_FILE;

[tzik, 2013/01/21 07:10:41]

Don't we support directory for DeviceMedia?

[kinuko, 2013/01/21 07:57:55]

No, I needed to make this change in CreateSnapshotFile. Fixed.

 
   if (file_info->is_directory ||
       context->media_path_filter()->Match(url.path()))
     return base::PLATFORM_FILE_OK;
   return base::PLATFORM_FILE_ERROR_NOT_FOUND;
 }
 
 scoped_ptr<FileSystemFileUtil::AbstractFileEnumerator>
 DeviceMediaFileUtil::CreateFileEnumerator(
     FileSystemOperationContext* context,
@@ skipping 25 matching lines @@
   return base::PLATFORM_FILE_ERROR_FAILED;
 }
 
 PlatformFileError DeviceMediaFileUtil::Truncate(
     FileSystemOperationContext* context,
     const FileSystemURL& url,
     int64 length) {
   return base::PLATFORM_FILE_ERROR_FAILED;
 }
 
-bool DeviceMediaFileUtil::IsDirectoryEmpty(
-    FileSystemOperationContext* context,
-    const FileSystemURL& url) {
-  MTPDeviceDelegate* delegate = GetMTPDeviceDelegate(context);
-  if (!delegate)
-    return false;
-
-  scoped_ptr<AbstractFileEnumerator> enumerator(
-      CreateFileEnumerator(context, url, false));
-  FilePath path;
-  while (!(path = enumerator->Next()).empty()) {
-    if (enumerator->IsDirectory() ||
-        context->media_path_filter()->Match(path))
-      return false;
-  }
-  return true;
-}
-
 PlatformFileError DeviceMediaFileUtil::CopyOrMoveFile(
     FileSystemOperationContext* context,
     const FileSystemURL& src_url,
     const FileSystemURL& dest_url,
     bool copy) {
   return base::PLATFORM_FILE_ERROR_SECURITY;
 }
 
 PlatformFileError DeviceMediaFileUtil::CopyInForeignFile(
     FileSystemOperationContext* context,
     const FilePath& src_file_path,
     const FileSystemURL& dest_url) {
   return base::PLATFORM_FILE_ERROR_SECURITY;
 }
 
 PlatformFileError DeviceMediaFileUtil::DeleteFile(
     FileSystemOperationContext* context,
     const FileSystemURL& url) {
   return base::PLATFORM_FILE_ERROR_SECURITY;
 }
 
-PlatformFileError DeviceMediaFileUtil::DeleteSingleDirectory(
+PlatformFileError DeviceMediaFileUtil::DeleteDirectory(
     FileSystemOperationContext* context,
     const FileSystemURL& url) {
   return base::PLATFORM_FILE_ERROR_SECURITY;
 }
 
 base::PlatformFileError DeviceMediaFileUtil::CreateSnapshotFile(
     FileSystemOperationContext* context,
     const FileSystemURL& url,
     base::PlatformFileInfo* file_info,
     FilePath* local_path,
@@ skipping 24 matching lines @@
       isolated_media_file_system_dir_path, local_path);
   if (!file_created) {
     LOG(WARNING) << "Could not create a temporary file for media snapshot in "
                  << isolated_media_file_system_dir_path.value();
     return base::PLATFORM_FILE_ERROR_FAILED;
   }
   return delegate->CreateSnapshotFile(url.path(), *local_path, file_info);
 }
 
 }  // namespace fileapi