Converted LocalInputMonitor into a SessionController instance.

remoting/host/desktop_session_agent.cc

Index: remoting/host/desktop_session_agent.cc
diff --git a/remoting/host/desktop_session_agent.cc b/remoting/host/desktop_session_agent.cc
index f50746ea33bc50dd5b15418fc3e5fa4703b71e32..e72c765af0d6a9a91484e481fcdd21a3b249d1df 100644
--- a/remoting/host/desktop_session_agent.cc
+++ b/remoting/host/desktop_session_agent.cc
@@ -17,7 +17,6 @@
 #include "remoting/host/desktop_environment.h"
 #include "remoting/host/disconnect_window.h"
 #include "remoting/host/event_executor.h"
-#include "remoting/host/local_input_monitor.h"
 #include "remoting/host/remote_input_filter.h"
 #include "remoting/host/screen_resolution.h"
 #include "remoting/host/session_controller.h"
@@ -70,7 +69,6 @@ DesktopSessionAgent::Delegate::~Delegate() {
 DesktopSessionAgent::~DesktopSessionAgent() {
   DCHECK(!audio_capturer_);
   DCHECK(!disconnect_window_);
-  DCHECK(!local_input_monitor_);
   DCHECK(!network_channel_);
   DCHECK(!video_capturer_);
 
@@ -215,19 +213,11 @@ void DesktopSessionAgent::OnStartSessionAgent(
   event_executor_->Start(clipboard_stub.Pass());
 
   // Create the disconnect window.
-  base::Closure disconnect_session =
-      base::Bind(&DesktopSessionAgent::DisconnectSession, this);
   disconnect_window_ = DisconnectWindow::Create(&ui_strings_);
   disconnect_window_->Show(
-      disconnect_session,
+      base::Bind(&DesktopSessionAgent::DisconnectSession, this),
       authenticated_jid.substr(0, authenticated_jid.find('/')));
 
-  // Start monitoring local input.
-  local_input_monitor_ = LocalInputMonitor::Create(caller_task_runner_,
-                                                   input_task_runner_,
-                                                   caller_task_runner_);
-  local_input_monitor_->Start(this, disconnect_session);
-
   // Start the audio capturer.
   if (delegate_->desktop_environment_factory().SupportsAudioCapture()) {
     audio_capturer_ = desktop_environment->CreateAudioCapturer();
@@ -326,10 +316,7 @@ void DesktopSessionAgent::Stop() {
     disconnect_window_->Hide();
     disconnect_window_.reset();
 
-    // Stop monitoring to local input.
-    local_input_monitor_->Stop();
-    local_input_monitor_.reset();
-
+    session_controller_.reset();
     remote_input_filter_.reset();
 
     // Ensure that any pressed keys or buttons are released.
@@ -337,7 +324,6 @@ void DesktopSessionAgent::Stop() {
     input_tracker_.reset();
 
     event_executor_.reset();
-    session_controller_.reset();
 
     // Stop the audio capturer.
     audio_capture_task_runner()->PostTask(