Remove PlatformFile from fileapi::FileSystemOperation

webkit/browser/fileapi/file_system_operation_impl.cc

 // Copyright 2013 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/file_system_operation_impl.h"
 
 #include "base/bind.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
@@ skipping 185 matching lines @@
       base::Bind(&FileSystemOperationImpl::DidFinishOperation,
                  weak_factory_.GetWeakPtr(), callback));
 }
 
 void FileSystemOperationImpl::OpenFile(const FileSystemURL& url,
                                        int file_flags,
                                        const OpenFileCallback& callback) {
   DCHECK(SetPendingOperationType(kOperationOpenFile));
 
   if (file_flags &
-      (base::PLATFORM_FILE_TEMPORARY | base::PLATFORM_FILE_HIDDEN)) {
-    callback.Run(base::File::FILE_ERROR_FAILED,
-                 base::kInvalidPlatformFileValue,
+      (base::File::FLAG_TEMPORARY | base::File::FLAG_HIDDEN)) {
+    callback.Run(base::File(base::File::FILE_ERROR_FAILED),
                  base::Closure());
     return;
   }
   GetUsageAndQuotaThenRunTask(
       url,
       base::Bind(&FileSystemOperationImpl::DoOpenFile,
                  weak_factory_.GetWeakPtr(),
                  url, callback, file_flags),
-      base::Bind(callback, base::File::FILE_ERROR_FAILED,
-                 base::kInvalidPlatformFileValue,
+      base::Bind(callback, Passed(base::File(base::File::FILE_ERROR_FAILED)),
                  base::Closure()));
 }
 
 // We can only get here on a write or truncate that's not yet completed.
 // We don't support cancelling any other operation at this time.
 void FileSystemOperationImpl::Cancel(const StatusCallback& cancel_callback) {
   DCHECK(cancel_callback_.is_null());
   cancel_callback_ = cancel_callback;
 
   if (file_writer_delegate_.get()) {
@@ skipping 311 matching lines @@
   StatusCallback cancel_callback = cancel_callback_;
   write_callback.Run(rv, bytes, complete);
   if (!cancel_callback.is_null())
     cancel_callback.Run(base::File::FILE_OK);
 }
 
 void FileSystemOperationImpl::DidOpenFile(
     const OpenFileCallback& callback,
     base::File file,
     const base::Closure& on_close_callback) {
-  // TODO(rvargas): Remove PlatformFile from FileSystemOperation.
-  base::File::Error error;
-  base::PlatformFile platform_file;
-  if (file.IsValid()) {
-    error = base::File::FILE_OK;
-    platform_file = file.TakePlatformFile();
-  } else {
-    error = file.error_details();
-    platform_file = base::kInvalidPlatformFileValue;
-  }
-  callback.Run(error, platform_file, on_close_callback);
+  callback.Run(file.Pass(), on_close_callback);
 }
 
 bool FileSystemOperationImpl::SetPendingOperationType(OperationType type) {
   if (pending_operation_ != kOperationNone)
     return false;
   pending_operation_ = type;
   return true;
 }
 
 }  // namespace fileapi