Fix ChromotingHost and DesktopEnvironmentFactory references to TaskRunners.

remoting/host/chromoting_host.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef REMOTING_HOST_CHROMOTING_HOST_H_
 #define REMOTING_HOST_CHROMOTING_HOST_H_
 
 #include <string>
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
+#include "base/memory/ref_counted.h"
 #include "base/observer_list.h"
 #include "base/threading/thread.h"
 #include "net/base/backoff_entry.h"
 #include "remoting/host/client_session.h"
 #include "remoting/host/host_key_pair.h"
 #include "remoting/host/host_status_observer.h"
 #include "remoting/host/mouse_move_observer.h"
 #include "remoting/host/ui_strings.h"
 #include "remoting/protocol/authenticator.h"
 #include "remoting/protocol/session_manager.h"
 #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 {
 class InputStub;
 class SessionConfig;
 class CandidateSessionConfig;
 }  // namespace protocol
 
-class ChromotingHostContext;
 class DesktopEnvironmentFactory;
 
 // A class to implement the functionality of a host process.
 //
 // Here's the work flow of this class:
 // 1. We should load the saved GAIA ID token or if this is the first
 //    time the host process runs we should prompt user for the
 //    credential. We will use this token or credentials to authenicate
 //    and register the host.
 //
@@ skipping 10 matching lines @@
 // 3. When the user is disconnected, we will pause the ScreenRecorder
 //    and try to terminate the threads we have created. This will allow
 //    all pending tasks to complete. After all of that completed we
 //    return to the idle state. We then go to step (2) if there a new
 //    incoming connection.
 class ChromotingHost : public base::RefCountedThreadSafe<ChromotingHost>,
                        public ClientSession::EventHandler,
                        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
+  // |desktop_environment_factory| remain valid at least until the
+  // |shutdown_task| supplied to Shutdown() has been notified.

[alexeypa (please no reviews), 2012/10/02 17:00:13]

nit: notified -> called/invoked/executed?

   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.
   //
   // After this is invoked, the host process will connect to the talk
   // network and start listening for incoming connections.
   //
   // This method can only be called once during the lifetime of this object.
   void Start(const std::string& xmpp_login);
 
   // Asynchronously shutdown the host process. |shutdown_task| is
@@ skipping 83 matching lines @@
   // Called when a client session is stopped completely.
   void OnClientStopped();
 
   // Called from Shutdown() to finish shutdown.
   void ShutdownFinish();
 
   // Unless specified otherwise all members of this class must be
   // 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_;
 
   // Must be used on the network thread only.
   ObserverList<HostStatusObserver> status_observers_;
 
   // The connections to remote clients.
   ClientList clients_;
 
@@ skipping 25 matching lines @@
 
   // The maximum duration of any session.
   base::TimeDelta max_session_duration_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromotingHost);
 };
 
 }  // namespace remoting
 
 #endif  // REMOTING_HOST_CHROMOTING_HOST_H_