Remove some PlatformFile uses from NaCl.

components/nacl/browser/nacl_file_host.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 "components/nacl/browser/nacl_file_host.h"
 
 #include "base/bind.h"
 #include "base/file_util.h"
+#include "base/files/file.h"
 #include "base/files/file_path.h"
 #include "base/path_service.h"
-#include "base/platform_file.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "components/nacl/browser/nacl_browser.h"
 #include "components/nacl/browser/nacl_browser_delegate.h"
 #include "components/nacl/browser/nacl_host_message_filter.h"
 #include "components/nacl/common/nacl_host_messages.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/site_instance.h"
 #include "ipc/ipc_platform_file.h"
 
 using content::BrowserThread;
 
 namespace {
 
 // Force a prefix to prevent user from opening "magic" files.
 const char* kExpectedFilePrefix = "pnacl_public_";
 
 // Restrict PNaCl file lengths to reduce likelyhood of hitting bugs
 // in file name limit error-handling-code-paths, etc.
 const size_t kMaxFileLength = 40;
 
 void NotifyRendererOfError(
     nacl::NaClHostMessageFilter* nacl_host_message_filter,
     IPC::Message* reply_msg) {
   reply_msg->set_reply_error();
   nacl_host_message_filter->Send(reply_msg);
 }
 
-bool PnaclDoOpenFile(const base::FilePath& file_to_open,
-                     base::PlatformFile* out_file) {
-  base::PlatformFileError error_code;
-  *out_file = base::CreatePlatformFile(file_to_open,
-                                       base::PLATFORM_FILE_OPEN |
-                                       base::PLATFORM_FILE_READ,
-                                       NULL,
-                                       &error_code);
-  if (error_code != base::PLATFORM_FILE_OK) {
-    return false;
-  }
-  return true;
+base::File PnaclDoOpenFile(const base::FilePath& file_to_open) {
+  return base::File(file_to_open,
+                    base::File::FLAG_OPEN | base::File::FLAG_READ);
 }
 
 void DoOpenPnaclFile(
     scoped_refptr<nacl::NaClHostMessageFilter> nacl_host_message_filter,
     const std::string& filename,
     IPC::Message* reply_msg) {
   DCHECK(BrowserThread::GetBlockingPool()->RunsTasksOnCurrentThread());
   base::FilePath full_filepath;
 
   // PNaCl must be installed.
   base::FilePath pnacl_dir;
   if (!nacl::NaClBrowser::GetDelegate()->GetPnaclDirectory(&pnacl_dir) ||
       !base::PathExists(pnacl_dir)) {
     NotifyRendererOfError(nacl_host_message_filter.get(), reply_msg);
     return;
   }
 
   // Do some validation.
   if (!nacl_file_host::PnaclCanOpenFile(filename, &full_filepath)) {
     NotifyRendererOfError(nacl_host_message_filter.get(), reply_msg);
     return;
   }
 
-  base::PlatformFile file_to_open;
-  if (!PnaclDoOpenFile(full_filepath, &file_to_open)) {
+  base::File file_to_open = PnaclDoOpenFile(full_filepath);
+  if (!file_to_open.IsValid()) {
     NotifyRendererOfError(nacl_host_message_filter.get(), reply_msg);
     return;
   }
 
   // Send the reply!
   // Do any DuplicateHandle magic that is necessary first.
   IPC::PlatformFileForTransit target_desc =
-      IPC::GetFileHandleForProcess(file_to_open,
-                                   nacl_host_message_filter->PeerHandle(),
-                                   true /* Close source */);
+      IPC::TakeFileHandleForProcess(file_to_open.Pass(),
+                                    nacl_host_message_filter->PeerHandle());
   if (target_desc == IPC::InvalidPlatformFileForTransit()) {
     NotifyRendererOfError(nacl_host_message_filter.get(), reply_msg);
     return;
   }
   NaClHostMsg_GetReadonlyPnaclFD::WriteReplyParams(
       reply_msg, target_desc);
   nacl_host_message_filter->Send(reply_msg);
 }
 
 void DoRegisterOpenedNaClExecutableFile(
     scoped_refptr<nacl::NaClHostMessageFilter> nacl_host_message_filter,
-    base::PlatformFile file,
+    base::File file,
     base::FilePath file_path,
     IPC::Message* reply_msg) {
   // IO thread owns the NaClBrowser singleton.
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   nacl::NaClBrowser* nacl_browser = nacl::NaClBrowser::GetInstance();
   uint64 file_token_lo = 0;
   uint64 file_token_hi = 0;
   nacl_browser->PutFilePath(file_path, &file_token_lo, &file_token_hi);
 
-  IPC::PlatformFileForTransit file_desc = IPC::GetFileHandleForProcess(
-      file,
-      nacl_host_message_filter->PeerHandle(),
-      true /* close_source */);
+  IPC::PlatformFileForTransit file_desc = IPC::TakeFileHandleForProcess(
+      file.Pass(),
+      nacl_host_message_filter->PeerHandle());
 
   NaClHostMsg_OpenNaClExecutable::WriteReplyParams(
       reply_msg, file_desc, file_token_lo, file_token_hi);
   nacl_host_message_filter->Send(reply_msg);
 }
 
 // Convert the file URL into a file descriptor.
 // This function is security sensitive.  Be sure to check with a security
 // person before you modify it.
 void DoOpenNaClExecutableOnThreadPool(
     scoped_refptr<nacl::NaClHostMessageFilter> nacl_host_message_filter,
     const GURL& file_url,
     IPC::Message* reply_msg) {
   DCHECK(BrowserThread::GetBlockingPool()->RunsTasksOnCurrentThread());
 
   base::FilePath file_path;
   if (!nacl::NaClBrowser::GetDelegate()->MapUrlToLocalFilePath(
           file_url, true /* use_blocking_api */, &file_path)) {
     NotifyRendererOfError(nacl_host_message_filter.get(), reply_msg);
     return;
   }
 
-  base::PlatformFile file = nacl::OpenNaClExecutableImpl(file_path);
-  if (file != base::kInvalidPlatformFileValue) {
+  base::File file = nacl::OpenNaClExecutableImpl(file_path);
+  if (file.IsValid()) {
     // This function is running on the blocking pool, but the path needs to be
     // registered in a structure owned by the IO thread.
     BrowserThread::PostTask(
         BrowserThread::IO, FROM_HERE,
         base::Bind(
             &DoRegisterOpenedNaClExecutableFile,
             nacl_host_message_filter,
-            file, file_path, reply_msg));
+            Passed(file.Pass()), file_path, reply_msg));
   } else {
     NotifyRendererOfError(nacl_host_message_filter.get(), reply_msg);
     return;
   }
 }
 
 }  // namespace
 
 namespace nacl_file_host {
 
@@ skipping 83 matching lines @@
       FROM_HERE,
       base::Bind(
           &DoOpenNaClExecutableOnThreadPool,
           nacl_host_message_filter,
           file_url, reply_msg))) {
     NotifyRendererOfError(nacl_host_message_filter.get(), reply_msg);
   }
 }
 
 }  // namespace nacl_file_host