Remove PlatforFile from fileapi/native_file_util

webkit/browser/fileapi/native_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/browser/fileapi/native_file_util.h"
 
 #include "base/file_util.h"
 #include "base/files/file_enumerator.h"
 #include "base/memory/scoped_ptr.h"
 #include "net/base/file_stream.h"
@@ skipping 104 matching lines @@
 
 NativeFileUtil::CopyOrMoveMode NativeFileUtil::CopyOrMoveModeForDestination(
     const FileSystemURL& dest_url, bool copy) {
   if (copy) {
     return dest_url.mount_option().copy_sync_option() == COPY_SYNC_OPTION_SYNC ?
         COPY_SYNC : COPY_NOSYNC;
   }
   return MOVE;
 }
 
-base::File::Error NativeFileUtil::CreateOrOpen(
-    const base::FilePath& path, int file_flags,
-    PlatformFile* file_handle, bool* created) {
+base::File NativeFileUtil::CreateOrOpen(const base::FilePath& path,
+                                        int file_flags) {
   if (!base::DirectoryExists(path.DirName())) {
     // If its parent does not exist, should return NOT_FOUND error.
-    return base::File::FILE_ERROR_NOT_FOUND;
+    return base::File(base::File::FILE_ERROR_NOT_FOUND);

[kinuko, 2014/03/26 03:35:06]

Ah, ok, to return a specific error.. (I think I misread some of your previous
comments) Thanks for keeping the logic here.

   }
+
+  // TODO(rvargas): Check |file_flags| instead. See bug 356358.
   if (base::DirectoryExists(path))
-    return base::File::FILE_ERROR_NOT_A_FILE;
+    return base::File(base::File::FILE_ERROR_NOT_A_FILE);
 
-  // TODO(rvargas): convert this code to use base::File.
-  base::PlatformFileError error_code = base::PLATFORM_FILE_OK;
-  *file_handle = base::CreatePlatformFile(path, file_flags,
-                                          created, &error_code);
-  return static_cast<base::File::Error>(error_code);
-}
-
-base::File::Error NativeFileUtil::Close(PlatformFile file_handle) {
-  if (!base::ClosePlatformFile(file_handle))
-    return base::File::FILE_ERROR_FAILED;
-  return base::File::FILE_OK;
+  return base::File(path, file_flags);
 }
 
 base::File::Error NativeFileUtil::EnsureFileExists(
     const base::FilePath& path,
     bool* created) {
   if (!base::DirectoryExists(path.DirName()))
     // If its parent does not exist, should return NOT_FOUND error.
     return base::File::FILE_ERROR_NOT_FOUND;
 
   // Tries to create the |path| exclusively.  This should fail
@@ skipping 160 matching lines @@
   if (!base::DirectoryExists(path))
     return base::File::FILE_ERROR_NOT_A_DIRECTORY;
   if (!base::IsDirectoryEmpty(path))
     return base::File::FILE_ERROR_NOT_EMPTY;
   if (!base::DeleteFile(path, false))
     return base::File::FILE_ERROR_FAILED;
   return base::File::FILE_OK;
 }
 
 }  // namespace fileapi