Removed task runners from the DesktopEnviroment interface and introduced ScreenControls/ClientSessio

remoting/host/basic_desktop_environment.h

Index: remoting/host/basic_desktop_environment.h
diff --git a/remoting/host/basic_desktop_environment.h b/remoting/host/basic_desktop_environment.h
index a7f12cfa16a7c78c0ccb5bfec5d64b8c510d0e00..21e7be9df0985602253b542e60e35f8d2fe5ee8a 100644
--- a/remoting/host/basic_desktop_environment.h
+++ b/remoting/host/basic_desktop_environment.h
@@ -8,52 +8,94 @@
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
-#include "base/single_thread_task_runner.h"
-#include "base/threading/non_thread_safe.h"
 #include "remoting/host/desktop_environment.h"
 
 namespace remoting {
 
 // Used to create audio/video capturers and event executor that work with
 // the local console.
-class BasicDesktopEnvironment
-    : public base::NonThreadSafe,
-      public DesktopEnvironment {
+class BasicDesktopEnvironment : public DesktopEnvironment {
  public:
   virtual ~BasicDesktopEnvironment();
 
   // DesktopEnvironment implementation.
-  virtual scoped_ptr<AudioCapturer> CreateAudioCapturer(
-      scoped_refptr<base::SingleThreadTaskRunner> audio_task_runner) OVERRIDE;
-  virtual scoped_ptr<InputInjector> CreateInputInjector(
-      scoped_refptr<base::SingleThreadTaskRunner> input_task_runner,
-      scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) OVERRIDE;
-  virtual scoped_ptr<SessionController> CreateSessionController() OVERRIDE;
-  virtual scoped_ptr<media::ScreenCapturer> CreateVideoCapturer(
-      scoped_refptr<base::SingleThreadTaskRunner> capture_task_runner,
-      scoped_refptr<base::SingleThreadTaskRunner> encode_task_runner) OVERRIDE;
+  virtual scoped_ptr<AudioCapturer> CreateAudioCapturer() OVERRIDE;
+  virtual scoped_ptr<InputInjector> CreateInputInjector() OVERRIDE;
+  virtual scoped_ptr<ScreenControls> CreateScreenControls() OVERRIDE;
+  virtual scoped_ptr<media::ScreenCapturer> CreateVideoCapturer() OVERRIDE;
 
  protected:
   friend class BasicDesktopEnvironmentFactory;
-  BasicDesktopEnvironment();
+  BasicDesktopEnvironment(
+      scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner,
+      scoped_refptr<base::SingleThreadTaskRunner> input_task_runner,
+      scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner,
+      base::WeakPtr<ClientSessionControl> client_session_control);
+
+  scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner() const {
+    return caller_task_runner_;
+  }
+
+  scoped_refptr<base::SingleThreadTaskRunner> input_task_runner() const {
+    return input_task_runner_;
+  }
+
+  scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner() const {
+    return ui_task_runner_;
+  }
 
  private:
+  // Task runner on which methods of DesktopEnvironment interface should be
+  // called.
+  scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner_;
+
+  // Used to run input-related tasks.
+  scoped_refptr<base::SingleThreadTaskRunner> input_task_runner_;
+
+  // Used to run UI code.
+  scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner_;
+
   DISALLOW_COPY_AND_ASSIGN(BasicDesktopEnvironment);
 };
 
 // Used to create |BasicDesktopEnvironment| instances.
 class BasicDesktopEnvironmentFactory : public DesktopEnvironmentFactory {
  public:
-  BasicDesktopEnvironmentFactory();
+  BasicDesktopEnvironmentFactory(
+      scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner,
+      scoped_refptr<base::SingleThreadTaskRunner> input_task_runner,
+      scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner);
   virtual ~BasicDesktopEnvironmentFactory();
 
   // DesktopEnvironmentFactory implementation.
   virtual scoped_ptr<DesktopEnvironment> Create(
-      const std::string& client_jid,
-      const base::Closure& disconnect_callback) OVERRIDE;
+      base::WeakPtr<ClientSessionControl> client_session_control) OVERRIDE;
   virtual bool SupportsAudioCapture() const OVERRIDE;
 
+ protected:
+  scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner() const {
+    return caller_task_runner_;
+  }
+
+  scoped_refptr<base::SingleThreadTaskRunner> input_task_runner() const {
+    return input_task_runner_;
+  }
+
+  scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner() const {
+    return ui_task_runner_;
+  }
+
  private:
+  // Task runner on which methods of DesktopEnvironmentFactory interface should
+  // be called.
+  scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner_;
+
+  // Used to run input-related tasks.
+  scoped_refptr<base::SingleThreadTaskRunner> input_task_runner_;
+
+  // Used to run UI code.
+  scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner_;
+
   DISALLOW_COPY_AND_ASSIGN(BasicDesktopEnvironmentFactory);
 };