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

components/nacl/renderer/plugin/pnacl_resources.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/renderer/plugin/pnacl_resources.h"
 
 #include <stddef.h>
 
 #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"
 #include "ppapi/c/pp_errors.h"
 
 namespace plugin {
 
 namespace {
 
 static const char kPnaclBaseUrl[] = "chrome://pnacl-translator/";
 
 std::string GetFullUrl(const std::string& partial_url) {
   return std::string(kPnaclBaseUrl) + GetNaClInterface()->GetSandboxArch() +
          "/" + partial_url;
 }
 
 }  // namespace
 
 PnaclResources::PnaclResources(Plugin* plugin, bool use_subzero)
     : plugin_(plugin), use_subzero_(use_subzero) {
   for (PnaclResourceEntry& entry : resources_) {
     entry.file_info = kInvalidNaClFileInfo;
   }
 }
 
 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);
   }
 }
 
 const std::string& PnaclResources::GetUrl(ResourceType type) const {
   size_t index = static_cast<size_t>(type);
   DCHECK(index < NUM_TYPES);
   return resources_[index].tool_name;
 }
 
 PP_NaClFileInfo PnaclResources::TakeFileInfo(ResourceType type) {
@@ skipping 41 matching lines @@
   for (ResourceType t : to_load) {
     plugin_->nacl_interface()->GetReadExecPnaclFd(
         resources_[t].tool_name.c_str(), &resources_[t].file_info);
     all_valid =
         all_valid && resources_[t].file_info.handle != PP_kInvalidFileHandle;
   }
   return all_valid;
 }
 
 }  // namespace plugin