Fix ChromotingHost and DesktopEnvironmentFactory references to TaskRunners.

remoting/host/chromoting_host.h

Index: remoting/host/chromoting_host.h
diff --git a/remoting/host/chromoting_host.h b/remoting/host/chromoting_host.h
index 4742f94fd993b3df86185f45448f896d47a877f6..0159d807fef37de8f6434c8d703d69c09aaeaab3 100644
--- a/remoting/host/chromoting_host.h
+++ b/remoting/host/chromoting_host.h
@@ -22,6 +22,10 @@
 #include "remoting/protocol/connection_to_client.h"
 #include "third_party/skia/include/core/SkSize.h"
 
+namespace base {
+class SingleThreadTaskRunner;
+}  // namespace base
+
 namespace remoting {
 
 namespace protocol {
@@ -30,7 +34,6 @@ class SessionConfig;
 class CandidateSessionConfig;
 }  // namespace protocol
 
-class ChromotingHostContext;
 class DesktopEnvironmentFactory;
 
 // A class to implement the functionality of a host process.
@@ -61,13 +64,17 @@ class ChromotingHost : public base::RefCountedThreadSafe<ChromotingHost>,
                        public protocol::SessionManager::Listener,
                        public MouseMoveObserver {
  public:
-  // The caller must ensure that |context|, |signal_strategy| and
-  // |environment| out-live the host.
+  // The caller must ensure that |signal_strategy| and |environment| out-live

[alexeypa (please no reviews), 2012/10/01 18:31:34]

nit: environment -> desktop_environment_factory

[alexeypa (please no reviews), 2012/10/01 18:31:34]

How about:

The caller must ensure that ... are alive until the host is completely stopped.

Then you will not need TODO, just to make sure that the pointers are cleared
before running |shutdown_task|.

[Wez, 2012/10/02 05:19:44]

Done.

[Wez, 2012/10/02 05:19:44]

Done.

+  // the host.
+  // TODO(wez): Even though that's not possible because it's ref-counted - fix
+  // fix that!
   ChromotingHost(
-      ChromotingHostContext* context,
       SignalStrategy* signal_strategy,
       DesktopEnvironmentFactory* desktop_environment_factory,
-      scoped_ptr<protocol::SessionManager> session_manager);
+      scoped_ptr<protocol::SessionManager> session_manager,
+      scoped_refptr<base::SingleThreadTaskRunner> capture_task_runner,
+      scoped_refptr<base::SingleThreadTaskRunner> encode_task_runner,
+      scoped_refptr<base::SingleThreadTaskRunner> network_task_runner);
 
   // Asynchronously start the host process.
   //
@@ -171,9 +178,11 @@ class ChromotingHost : public base::RefCountedThreadSafe<ChromotingHost>,
   // used on the network thread only.
 
   // Parameters specified when the host was created.
-  ChromotingHostContext* context_;
   DesktopEnvironmentFactory* desktop_environment_factory_;
   scoped_ptr<protocol::SessionManager> session_manager_;
+  scoped_refptr<base::SingleThreadTaskRunner> capture_task_runner_;
+  scoped_refptr<base::SingleThreadTaskRunner> encode_task_runner_;
+  scoped_refptr<base::SingleThreadTaskRunner> network_task_runner_;
 
   // Connection objects.
   SignalStrategy* signal_strategy_;