[Chromoting] Moving the daemon IPC channel to ChromotingHostContext.

remoting/host/session_event_executor_win.cc

Index: remoting/host/session_event_executor_win.cc
diff --git a/remoting/host/session_event_executor_win.cc b/remoting/host/session_event_executor_win.cc
index aff6a7dcde9cffeb79eed720466260ba6240bbf3..c8ba8f535b7b18e12162ab44f4038eda069c45bf 100644
--- a/remoting/host/session_event_executor_win.cc
+++ b/remoting/host/session_event_executor_win.cc
@@ -7,7 +7,6 @@
 #include <string>
 
 #include "base/bind.h"
-#include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/single_thread_task_runner.h"
 #include "base/win/windows_version.h"
@@ -20,9 +19,6 @@
 
 namespace {
 
-// The command line switch specifying the name of the Chromoting IPC channel.
-const char kProcessChannelId[] = "chromoting-ipc";
-
 const uint32 kUsbLeftControl =  0x0700e0;
 const uint32 kUsbRightControl = 0x0700e4;
 const uint32 kUsbLeftAlt =  0x0700e2;
@@ -75,26 +71,17 @@ using protocol::KeyEvent;
 
 SessionEventExecutorWin::SessionEventExecutorWin(
     scoped_refptr<base::SingleThreadTaskRunner> main_task_runner,
-    scoped_refptr<base::SingleThreadTaskRunner> io_task_runner,
+    IPC::ChannelProxy* daemon_channel,
     scoped_ptr<EventExecutor> nested_executor)
     : nested_executor_(nested_executor.Pass()),
       task_runner_(main_task_runner),
+      daemon_channel_(daemon_channel),
       ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)),
       weak_ptr_(weak_ptr_factory_.GetWeakPtr()) {
   // Let |weak_ptr_| be used on the |task_runner_| thread.
   // |weak_ptr_| and |weak_ptr_factory_| share a ThreadChecker, so the
   // following line affects both of them.
   weak_ptr_factory_.DetachFromThread();
-
-  std::string channel_name =
-      CommandLine::ForCurrentProcess()->GetSwitchValueASCII(kProcessChannelId);
-
-  // Connect to the Chromoting IPC channel if the name was passed in the command
-  // line.
-  if (!channel_name.empty()) {
-    chromoting_channel_.reset(new IPC::ChannelProxy(
-        channel_name, IPC::Channel::MODE_CLIENT, this, io_task_runner));
-  }
 }
 
 SessionEventExecutorWin::~SessionEventExecutorWin() {
@@ -159,8 +146,8 @@ void SessionEventExecutorWin::InjectKeyEvent(const KeyEvent& event) {
 
         if (base::win::GetVersion() == base::win::VERSION_XP) {
           EmulateSecureAttentionSequence();
-        } else if (chromoting_channel_.get()) {
-          chromoting_channel_->Send(new ChromotingHostMsg_SendSasToConsole());
+        } else if (daemon_channel_ != NULL) {
+          daemon_channel_->Send(new ChromotingHostMsg_SendSasToConsole());
         }
       }
 
@@ -187,10 +174,6 @@ void SessionEventExecutorWin::InjectMouseEvent(const MouseEvent& event) {
   nested_executor_->InjectMouseEvent(event);
 }
 
-bool SessionEventExecutorWin::OnMessageReceived(const IPC::Message& message) {
-  return false;
-}
-
 void SessionEventExecutorWin::SwitchToInputDesktop() {
   // Switch to the desktop receiving user input if different from the current
   // one.