PNaCl cleanup: Reuse base::File for closing a handle/FD

This removes a dependency on the NACL_WINDOWS macro, which is defined
in non-public native_client headers.

It also gets the benefit of the error-checking that base/ does for
close()/CloseHandle().

BUG= https://bugs.chromium.org/p/nativeclient/issues/detail?id=2832
TEST=e.g. NaClBrowserTestPnacl.PPAPICore (tests PNaCl translation)

Review URL: https://codereview.chromium.org/1640523002

Cr-Commit-Position: refs/heads/master@{#371692}

components/nacl/renderer/plugin/pnacl_resources.cc

@@ -8,6 +8,7 @@
 
 #include <vector>
 
+#include "base/files/file.h"
 #include "base/logging.h"
 #include "components/nacl/renderer/plugin/plugin.h"
 #include "components/nacl/renderer/plugin/utility.h"
@@ -35,8 +36,7 @@ PnaclResources::PnaclResources(Plugin* plugin, bool use_subzero)
 
 PnaclResources::~PnaclResources() {
   for (PnaclResourceEntry& entry : resources_) {
-    if (entry.file_info.handle != PP_kInvalidFileHandle)
-      CloseFileHandle(entry.file_info.handle);
+    base::File closer(entry.file_info.handle);
   }
 }
 

components/nacl/renderer/plugin/utility.cc

@@ -73,12 +73,4 @@ void SetNaClInterface(const PPB_NaCl_Private* nacl_interface) {
   g_nacl_interface = nacl_interface;
 }
 
-void CloseFileHandle(PP_FileHandle file_handle) {
-#if NACL_WINDOWS
-  CloseHandle(file_handle);
-#else
-  close(file_handle);
-#endif
-}
-
 }  // namespace plugin

components/nacl/renderer/plugin/utility.h

@@ -14,7 +14,6 @@
 #include "components/nacl/renderer/ppb_nacl_private.h"
 #include "native_client/src/shared/platform/nacl_threads.h"
 #include "native_client/src/shared/platform/nacl_time.h"
-#include "ppapi/c/private/pp_file_handle.h"
 
 #define SRPC_PLUGIN_DEBUG 1
 
@@ -23,8 +22,6 @@ namespace plugin {
 const PPB_NaCl_Private* GetNaClInterface();
 void SetNaClInterface(const PPB_NaCl_Private* nacl_interface);
 
-void CloseFileHandle(PP_FileHandle file_handle);
-
 // Debugging print utility
 extern int gNaClPluginDebugPrintEnabled;
 extern int NaClPluginPrintLog(const char *format, ...);