Pepper: DescWrapper cleanup in PnaclResources.

ppapi/native_client/src/trusted/plugin/pnacl_resources.h

 // 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.
 
 #ifndef NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_PNACL_RESOURCES_H_
 #define NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_PNACL_RESOURCES_H_
 
 #include <map>
 #include <vector>
 
@@ skipping 28 matching lines @@
 };
 
 // Loads a list of resources, providing a way to get file descriptors for
 // these resources.  URLs for resources are resolved by the manifest
 // and point to pnacl component filesystem resources.
 class PnaclResources {
  public:
   PnaclResources(Plugin* plugin,
                  PnaclCoordinator* coordinator)
       : plugin_(plugin),
-        coordinator_(coordinator) {
+        coordinator_(coordinator),
+        llc_file_handle_(PP_kInvalidFileHandle),
+        ld_file_handle_(PP_kInvalidFileHandle) {
   }
   virtual ~PnaclResources();
 
   // Read the resource info JSON file.  This is the first step after
   // construction; it has to be completed before StartLoad is called.
   virtual void ReadResourceInfo(
       const nacl::string& resource_info_url,
       const pp::CompletionCallback& resource_info_read_cb);
 
   // Start loading the resources.
   virtual void StartLoad(
       const pp::CompletionCallback& all_loaded_callback);
 
   const nacl::string& GetLlcUrl() { return llc_tool_name_; }
   const nacl::string& GetLdUrl() { return ld_tool_name_; }
 
-  nacl::string GetFullUrl(const nacl::string& partial_url,
-                          const nacl::string& sandbox_arch) const;
-
-  // Get file descs by name. Only valid after StartLoad's completion callback
-  // fired.
-  nacl::DescWrapper* WrapperForUrl(const nacl::string& url);
-
-  static int32_t GetPnaclFD(Plugin* plugin, const char* filename);
+  PP_FileHandle TakeLlcFileHandle();
+  PP_FileHandle TakeLdFileHandle();
 
  private:
   NACL_DISALLOW_COPY_AND_ASSIGN(PnaclResources);
 
   // The plugin requesting the resource loading.
   Plugin* plugin_;
   // The coordinator responsible for reporting errors, etc.
   PnaclCoordinator* coordinator_;
-  // The descriptor wrappers for the downloaded URLs.  Only valid
-  // once all_loaded_callback_ has been invoked.
-  std::map<nacl::string, nacl::DescWrapper*> resource_wrappers_;
 
   // Tool names for llc and ld; read from the resource info file.
   nacl::string llc_tool_name_;
   nacl::string ld_tool_name_;
+
+  // File handles for llc and ld executables, after they've been opened.
+  // Only valid after the callback for StartLoad() has been called.

[bbudge, 2014/05/21 02:04:24]

and until the Take* fns are called?

+  PP_FileHandle llc_file_handle_;
+  PP_FileHandle ld_file_handle_;
 };
 
 }  // namespace plugin;
 #endif  // NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_PNACL_RESOURCES_H_