Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / components / nacl / loader / nacl_trusted_listener.cc

diff --git a/src/components/nacl/loader/nacl_trusted_listener.cc b/src/components/nacl/loader/nacl_trusted_listener.cc
index 125f146..d9e5633 100644 (file)
--- a/src/components/nacl/loader/nacl_trusted_listener.cc
+++ b/src/components/nacl/loader/nacl_trusted_listener.cc
@@ -8,10 +8,15 @@
 
 NaClTrustedListener::NaClTrustedListener(
     const IPC::ChannelHandle& handle,
-    base::SingleThreadTaskRunner* ipc_task_runner)
-    : channel_handle_(handle),
-      channel_proxy_(IPC::ChannelProxy::Create(
-          handle, IPC::Channel::MODE_SERVER, this, ipc_task_runner)) {
+    base::SingleThreadTaskRunner* ipc_task_runner,
+    base::WaitableEvent* shutdown_event)
+    : channel_handle_(handle) {
+  channel_ = IPC::SyncChannel::Create(handle,
+                                      IPC::Channel::MODE_SERVER,
+                                      this,
+                                      ipc_task_runner,
+                                      true,  /* create_channel_now */
+                                      shutdown_event).Pass();
 }
 
 NaClTrustedListener::~NaClTrustedListener() {
@@ -21,7 +26,7 @@ IPC::ChannelHandle NaClTrustedListener::TakeClientChannelHandle() {
   IPC::ChannelHandle handle = channel_handle_;
 #if defined(OS_POSIX)
   handle.socket =
-      base::FileDescriptor(channel_proxy_->TakeClientFileDescriptor(), true);
+      base::FileDescriptor(channel_->TakeClientFileDescriptor(), true);
 #endif
   return handle;
 }
@@ -31,9 +36,9 @@ bool NaClTrustedListener::OnMessageReceived(const IPC::Message& msg) {
 }
 
 void NaClTrustedListener::OnChannelError() {
-  channel_proxy_->Close();
+  channel_->Close();
 }
 
 bool NaClTrustedListener::Send(IPC::Message* msg) {
-  return channel_proxy_->Send(msg);
+  return channel_->Send(msg);
 }