Index: components/nacl/renderer/ppb_nacl_private_impl.cc |
diff --git a/components/nacl/renderer/ppb_nacl_private_impl.cc b/components/nacl/renderer/ppb_nacl_private_impl.cc |
index 237e6d9a02489276b1cff798c15867f722197055..1e64407b779fb67301141f37e50d4c658cd8327c 100644 |
--- a/components/nacl/renderer/ppb_nacl_private_impl.cc |
+++ b/components/nacl/renderer/ppb_nacl_private_impl.cc |
@@ -77,8 +77,6 @@ typedef std::map<PP_Instance, nacl::TrustedPluginChannel*> |
base::LazyInstance<InstanceTrustedChannelMap> g_channel_map = |
LAZY_INSTANCE_INITIALIZER; |
-base::WaitableEvent* g_shutdown_event; |
- |
void HistogramEnumerate(const std::string& name, |
int32_t sample, |
int32_t boundary_value) { |
@@ -195,10 +193,9 @@ void LaunchSelLdr(PP_Instance instance, |
invalid_handle = (launch_result.trusted_ipc_channel_handle.socket.fd == -1); |
#endif |
if (!invalid_handle) { |
- if (g_shutdown_event == NULL) |
- g_shutdown_event = new base::WaitableEvent(true, false); |
g_channel_map.Get()[instance] = new nacl::TrustedPluginChannel( |
- launch_result.trusted_ipc_channel_handle, callback, g_shutdown_event); |
+ launch_result.trusted_ipc_channel_handle, callback, |
+ content::RenderThread::Get()->GetShutdownEvent()); |
} |
*(static_cast<NaClHandle*>(imc_handle)) = |