ipc: Remove ipc_listener.h from ipc_channel.h and update the files.

chrome/nacl/nacl_ipc_adapter.h

Index: chrome/nacl/nacl_ipc_adapter.h
diff --git a/chrome/nacl/nacl_ipc_adapter.h b/chrome/nacl/nacl_ipc_adapter.h
index 3752139fb1c81fa01eaa97c86732b2a8ac62034f..f9db3dc3cf6c9777596b57136a0330c005739ea0 100644
--- a/chrome/nacl/nacl_ipc_adapter.h
+++ b/chrome/nacl/nacl_ipc_adapter.h
@@ -13,19 +13,20 @@
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
+#include "base/pickle.h"
 #include "base/shared_memory.h"
 #include "base/synchronization/condition_variable.h"
 #include "base/synchronization/lock.h"
 #include "base/task_runner.h"
-#include "ipc/ipc_channel.h"
-#include "ipc/ipc_message.h"
+#include "ipc/ipc_listener.h"
 
 struct NaClDesc;
 struct NaClImcTypedMsgHdr;
 struct PP_Size;
 
 namespace IPC {
-class Message;
+class Channel;
+struct ChannelHandle;
 }
 
 namespace nacl {