Remove PlatformFile from fileapi::FileSystemOperation

content/browser/renderer_host/pepper/pepper_file_io_host.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 "content/browser/renderer_host/pepper/pepper_file_io_host.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/callback_helpers.h"
 #include "base/files/file_util_proxy.h"
@@ skipping 219 matching lines @@
   file_system_host_->GetFileSystemOperationRunner()->OpenFile(
       file_system_url_,
       platform_file_flags,
       base::Bind(&PepperFileIOHost::DidOpenInternalFile,
                  weak_factory_.GetWeakPtr(),
                  reply_context));
 }
 
 void PepperFileIOHost::DidOpenInternalFile(
     ppapi::host::ReplyMessageContext reply_context,
-    base::File::Error result,
-    base::PlatformFile file,
+    base::File file,
     const base::Closure& on_close_callback) {
-  if (result == base::File::FILE_OK) {
+  if (file.IsValid()) {
     on_close_callback_ = on_close_callback;
 
     if (FileOpenForWrite(open_flags_) && file_system_host_->ChecksQuota()) {
       check_quota_ = true;
       file_system_host_->OpenQuotaFile(
           this,
           file_system_url_,
           base::Bind(&PepperFileIOHost::DidOpenQuotaFile,
                      weak_factory_.GetWeakPtr(),
                      reply_context,
-                     file));
+                     Passed(&file)));

[bbudge, 2014/05/22 17:12:20]

nit: could you fully qualify this (base::Passed) since we're not in namespace
base, just to make it a little clearer what Passed is?

[rvargas (doing something else), 2014/05/22 20:52:53]

Done.

       return;
     }
   }
 
-  ExecutePlatformOpenFileCallback(
-      reply_context, result, base::PassPlatformFile(&file), true);
+  DCHECK(!file_.IsValid());
+  base::File::Error error =
+      file.IsValid() ? base::File::FILE_OK : file.error_details();
+  file_.SetFile(file.Pass());
+  OnOpenProxyCallback(reply_context, error);
 }
 
 void PepperFileIOHost::GotResolvedRenderProcessId(
     ppapi::host::ReplyMessageContext reply_context,
     base::FilePath path,
     int file_flags,
     base::ProcessId resolved_render_process_id) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   resolved_render_process_id_ = resolved_render_process_id;
   file_.CreateOrOpen(
@@ skipping 79 matching lines @@
 
   if (file_.IsValid()) {
     file_.Close(base::Bind(&PepperFileIOHost::DidCloseFile,
                            weak_factory_.GetWeakPtr()));
   }
   return PP_OK;
 }
 
 void PepperFileIOHost::DidOpenQuotaFile(
     ppapi::host::ReplyMessageContext reply_context,
-    base::PlatformFile file,
+    base::File file,
     int64_t max_written_offset) {
+  DCHECK(!file_.IsValid());
+  DCHECK(file.IsValid());
   max_written_offset_ = max_written_offset;
+  file_.SetFile(file.Pass());
 
-  ExecutePlatformOpenFileCallback(
-      reply_context, base::File::FILE_OK, base::PassPlatformFile(&file), true);
+  OnOpenProxyCallback(reply_context, base::File::FILE_OK);
 }
 
 void PepperFileIOHost::DidCloseFile(base::File::Error /*error*/) {
   // Silently ignore if we fail to close the file.
   if (!on_close_callback_.is_null()) {
     on_close_callback_.Run();
     on_close_callback_.Reset();
   }
 }
 
@@ skipping 33 matching lines @@
 }
 
 void PepperFileIOHost::ExecutePlatformGeneralCallback(
     ppapi::host::ReplyMessageContext reply_context,
     base::File::Error error_code) {
   reply_context.params.set_result(ppapi::FileErrorToPepperError(error_code));
   host()->SendReply(reply_context, PpapiPluginMsg_FileIO_GeneralReply());
   state_manager_.SetOperationFinished();
 }
 
-// TODO(rvargas): this method should go away when FileApi moves to use File.
-void PepperFileIOHost::ExecutePlatformOpenFileCallback(
-    ppapi::host::ReplyMessageContext reply_context,
-    base::File::Error error_code,
-    base::PassPlatformFile file,
-    bool unused_created) {
-  DCHECK(!file_.IsValid());
-  file_.SetFile(base::File(file.ReleaseValue()));
-
-  OnOpenProxyCallback(reply_context, error_code);
-}
-
 void PepperFileIOHost::OnOpenProxyCallback(
     ppapi::host::ReplyMessageContext reply_context,
     base::File::Error error_code) {
   int32_t pp_error = ppapi::FileErrorToPepperError(error_code);
   if (file_.IsValid() && !AddFileToReplyContext(open_flags_, &reply_context))
     pp_error = PP_ERROR_FAILED;
 
   PP_Resource quota_file_system = 0;
   if (pp_error == PP_OK) {
     state_manager_.SetOpenSucceed();
@@ skipping 30 matching lines @@
 
   ppapi::proxy::SerializedHandle file_handle;
   // A non-zero resource id signals NaClIPCAdapter to create a NaClQuotaDesc.
   PP_Resource quota_file_io = check_quota_ ? pp_resource() : 0;
   file_handle.set_file_handle(transit_file, open_flags, quota_file_io);
   reply_context->params.AppendHandle(file_handle);
   return true;
 }
 
 }  // namespace content