Remove PlatformFile from fileapi::FileSystemFileUtil

webkit/browser/fileapi/async_file_util_adapter.cc

 // Copyright (c) 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/async_file_util_adapter.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/sequenced_task_runner.h"
@@ skipping 115 matching lines @@
                                 true /* has_more */));
       entries.clear();
     }
   }
   origin_loop->PostTask(
       FROM_HERE, base::Bind(callback, base::File::FILE_OK, entries,
                             false /* has_more */));
 }
 
 void RunCreateOrOpenCallback(
+    FileSystemOperationContext* context,
     const AsyncFileUtil::CreateOrOpenCallback& callback,
-    base::File::Error result,
-    base::PassPlatformFile file,
-    bool created) {
-  callback.Run(result, file, base::Closure());
+    base::File file) {
+  // TODO(rvargas): Remove PlatformFile from AsyncFileUtil.
+  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, base::PassPlatformFile(&platform_file), base::Closure());
+  base::File closer(platform_file);
 }
 
 }  // namespace
 
 AsyncFileUtilAdapter::AsyncFileUtilAdapter(
     FileSystemFileUtil* sync_file_util)
     : sync_file_util_(sync_file_util) {
   DCHECK(sync_file_util_.get());
 }
 
 AsyncFileUtilAdapter::~AsyncFileUtilAdapter() {
 }
 
 void AsyncFileUtilAdapter::CreateOrOpen(
     scoped_ptr<FileSystemOperationContext> context,
     const FileSystemURL& url,
     int file_flags,
     const CreateOrOpenCallback& callback) {
   FileSystemOperationContext* context_ptr = context.release();
-  const bool success = base::FileUtilProxy::RelayCreateOrOpen(
+  base::PostTaskAndReplyWithResult(
       context_ptr->task_runner(),
+      FROM_HERE,
       Bind(&FileSystemFileUtil::CreateOrOpen, Unretained(sync_file_util_.get()),
            context_ptr, url, file_flags),
-      Bind(&FileSystemFileUtil::Close, Unretained(sync_file_util_.get()),
-           base::Owned(context_ptr)),
-      Bind(&RunCreateOrOpenCallback, callback));
-  DCHECK(success);
+      Bind(&RunCreateOrOpenCallback, base::Owned(context_ptr), callback));
 }
 
 void AsyncFileUtilAdapter::EnsureFileExists(
     scoped_ptr<FileSystemOperationContext> context,
     const FileSystemURL& url,
     const EnsureFileExistsCallback& callback) {
   EnsureFileExistsHelper* helper = new EnsureFileExistsHelper;
   FileSystemOperationContext* context_ptr = context.release();
   const bool success = context_ptr->task_runner()->PostTaskAndReply(
       FROM_HERE,
@@ skipping 168 matching lines @@
   GetFileInfoHelper* helper = new GetFileInfoHelper;
   const bool success = context_ptr->task_runner()->PostTaskAndReply(
       FROM_HERE,
       Bind(&GetFileInfoHelper::CreateSnapshotFile, Unretained(helper),
            sync_file_util_.get(), base::Owned(context_ptr), url),
       Bind(&GetFileInfoHelper::ReplySnapshotFile, Owned(helper), callback));
   DCHECK(success);
 }
 
 }  // namespace fileapi