PPAPI/NaCl: Make NaClIPCAdapter transfer handles more generally

chrome/nacl/nacl_main_platform_delegate_win.cc

 // Copyright (c) 2011 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 "chrome/nacl/nacl_main_platform_delegate.h"
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/logging.h"
 #include "base/native_library.h"
 #include "chrome/common/chrome_switches.h"
+#include "native_client/src/shared/srpc/nacl_srpc.h"
+#include "native_client/src/trusted/desc/nrd_all_modules.h"
 #include "sandbox/win/src/sandbox.h"
 
 NaClMainPlatformDelegate::NaClMainPlatformDelegate(
     const content::MainFunctionParams& parameters)
     : parameters_(parameters), sandbox_test_module_(NULL) {
 }
 
 NaClMainPlatformDelegate::~NaClMainPlatformDelegate() {
 }
 
 void NaClMainPlatformDelegate::PlatformInitialize() {
   // Be mindful of what resources you acquire here. They can be used by
   // malicious code if the renderer gets compromised.
+
+  NaClNrdAllModulesInit();
+  NaClSrpcModuleInit();

[dmichael (off chromium), 2012/08/16 21:23:17]

This fixes (or just works around?) a problem we're having right now; I'm going
to pull it back out of this CL in the next upload, since it doesn't belong here.

 }
 
 void NaClMainPlatformDelegate::PlatformUninitialize() {
+  NaClSrpcModuleFini();
+  NaClNrdAllModulesFini();
 }
 
 void NaClMainPlatformDelegate::InitSandboxTests(bool no_sandbox) {
   const CommandLine& command_line = parameters_.command_line;
 
   DVLOG(1) << "Started NaClLdr with " << command_line.GetCommandLineString();
 
   sandbox::TargetServices* target_services =
       parameters_.sandbox_info->target_services;
 
@@ skipping 47 matching lines @@
       result = (*run_security_tests)();
     } else {
       VLOG(1) << "Failed to get NaCl sandbox test function";
       result = false;
     }
     base::UnloadNativeLibrary(sandbox_test_module_);
     sandbox_test_module_ = NULL;
   }
   return result;
 }