Fix ChromotingHost and DesktopEnvironmentFactory references to TaskRunners.

remoting/host/chromoting_host_context.h

Index: remoting/host/chromoting_host_context.h
diff --git a/remoting/host/chromoting_host_context.h b/remoting/host/chromoting_host_context.h
index 2e3c8e79a0546ab2e7660ef8740d7ffb53e098ef..0250f06df1913c7b60c7bcea50e6e83c46615ed7 100644
--- a/remoting/host/chromoting_host_context.h
+++ b/remoting/host/chromoting_host_context.h
@@ -18,6 +18,7 @@ class URLRequestContextGetter;
 }  // namespace net
 
 namespace remoting {
+
 class AutoThreadTaskRunner;
 
 // A class that manages threads and running context for the chromoting host
@@ -45,12 +46,6 @@ class ChromotingHostContext {
   // the screen.
   virtual base::SingleThreadTaskRunner* capture_task_runner();
 
-  // Task runner for the thread that is used by the EventExecutor.
-  //
-  // TODO(sergeyu): Do we need a separate thread for EventExecutor?
-  // Can we use some other thread instead?
-  virtual base::SingleThreadTaskRunner* desktop_task_runner();
-
   // Task runner for the thread used to encode video streams.
   virtual base::SingleThreadTaskRunner* encode_task_runner();
 
@@ -59,6 +54,12 @@ class ChromotingHostContext {
   // configuration and by NatConfig to read policy configs.
   virtual base::SingleThreadTaskRunner* file_task_runner();
 
+  // Task runner for the thread that is used by the EventExecutor.
+  //
+  // TODO(sergeyu): Do we need a separate thread for EventExecutor?
+  // Can we use some other thread instead?
+  virtual base::SingleThreadTaskRunner* input_task_runner();
+
   // Task runner for the thread used for network IO. This thread runs
   // a libjingle message loop, and is the only thread on which
   // libjingle code may be run.
@@ -80,15 +81,15 @@ class ChromotingHostContext {
   // A thread that hosts screen capture.
   base::Thread capture_thread_;
 
-  // A thread that hosts input injection.
-  base::Thread desktop_thread_;
-
   // A thread that hosts all encode operations.
   base::Thread encode_thread_;
 
   // Thread for blocking IO operations.
   base::Thread file_thread_;
 
+  // A thread that hosts input injection.
+  base::Thread input_thread_;
+
   // A thread that hosts all network operations.
   base::Thread network_thread_;
 
@@ -96,9 +97,9 @@ class ChromotingHostContext {
   // the corresponding threads to guarantee proper order of destruction.
   scoped_refptr<base::SingleThreadTaskRunner> audio_task_runner_;
   scoped_refptr<base::SingleThreadTaskRunner> capture_task_runner_;
-  scoped_refptr<base::SingleThreadTaskRunner> desktop_task_runner_;
   scoped_refptr<base::SingleThreadTaskRunner> encode_task_runner_;
   scoped_refptr<base::SingleThreadTaskRunner> file_task_runner_;
+  scoped_refptr<base::SingleThreadTaskRunner> input_task_runner_;
   scoped_refptr<base::SingleThreadTaskRunner> network_task_runner_;
 
   scoped_refptr<AutoThreadTaskRunner> ui_task_runner_;