Pepper: DescWrapper cleanup in PnaclResources.

ppapi/native_client/src/trusted/plugin/service_runtime.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.
  */
 
 #define NACL_LOG_MODULE_NAME "Plugin_ServiceRuntime"
 
 #include "ppapi/native_client/src/trusted/plugin/service_runtime.h"
 
@@ skipping 350 matching lines @@
       p->file_info->desc = -1;  // but failed.
       NaClXCondVarBroadcast(&cv_);
     }
     p->MaybeRunCallback(PP_OK);
     return;
   }
 
   if (PnaclUrls::IsPnaclComponent(mapped_url)) {
     // Special PNaCl support files, that are installed on the
     // user machine.
-    int32_t fd = PnaclResources::GetPnaclFD(
-        plugin_,
+    PP_FileHandle handle = plugin_->nacl_interface()->GetReadonlyPnaclFd(
         PnaclUrls::PnaclComponentURLToFilename(mapped_url).c_str());
+    int32_t fd = -1;
+    if (handle != PP_kInvalidFileHandle)
+      fd = ConvertFileDescriptor(handle, true);
+
     if (fd < 0) {
       // We checked earlier if the pnacl component wasn't installed
       // yet, so this shouldn't happen. At this point, we can't do much
       // anymore, so just continue with an invalid fd.
       NaClLog(4,
               "OpenManifestEntry_MainThreadContinuation: "
               "GetReadonlyPnaclFd failed\n");
     }
     {
       nacl::MutexLocker take(&mu_);
@@ skipping 451 matching lines @@
 
 nacl::string ServiceRuntime::GetCrashLogOutput() {
   if (NULL != subprocess_.get()) {
     return subprocess_->GetCrashLogOutput();
   } else {
     return std::string();
   }
 }
 
 }  // namespace plugin