Pepper: Make trusted plugin channel sync again.

components/nacl/loader/nacl_trusted_listener.h

Index: components/nacl/loader/nacl_trusted_listener.h
diff --git a/components/nacl/loader/nacl_trusted_listener.h b/components/nacl/loader/nacl_trusted_listener.h
index bb66b42a3e5e6a50065048132d768f1e98287275..75d755178560b795449a26ad6883338abf25d9e8 100644
--- a/components/nacl/loader/nacl_trusted_listener.h
+++ b/components/nacl/loader/nacl_trusted_listener.h
@@ -7,8 +7,8 @@
 
 #include "base/memory/ref_counted.h"
 #include "ipc/ipc_channel_handle.h"
-#include "ipc/ipc_channel_proxy.h"
 #include "ipc/ipc_listener.h"
+#include "ipc/ipc_sync_channel.h"
 
 namespace base {
 class SingleThreadTaskRunner;
@@ -18,7 +18,8 @@ class NaClTrustedListener : public base::RefCounted<NaClTrustedListener>,
                             public IPC::Listener {
  public:
   NaClTrustedListener(const IPC::ChannelHandle& handle,
-                      base::SingleThreadTaskRunner* ipc_task_runner);
+                      base::SingleThreadTaskRunner* ipc_task_runner,
+                      base::WaitableEvent* shutdown_event);
 
   IPC::ChannelHandle TakeClientChannelHandle();
 
@@ -32,7 +33,7 @@ class NaClTrustedListener : public base::RefCounted<NaClTrustedListener>,
   friend class base::RefCounted<NaClTrustedListener>;
   virtual ~NaClTrustedListener();
   IPC::ChannelHandle channel_handle_;
-  scoped_ptr<IPC::ChannelProxy> channel_proxy_;
+  scoped_ptr<IPC::SyncChannel> channel_;
 
   DISALLOW_COPY_AND_ASSIGN(NaClTrustedListener);
 };