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

remoting/host/me2me_desktop_environment.h

Index: remoting/host/me2me_desktop_environment.h
diff --git a/remoting/host/me2me_desktop_environment.h b/remoting/host/me2me_desktop_environment.h
index f07bc516d6dea0ecab66401893d52a6f352724b1..97f63bfc8ee23a534ef669ed224701557f0e082f 100644
--- a/remoting/host/me2me_desktop_environment.h
+++ b/remoting/host/me2me_desktop_environment.h
@@ -16,14 +16,16 @@ class Me2MeDesktopEnvironment : public BasicDesktopEnvironment {
   virtual ~Me2MeDesktopEnvironment();
 
   // DesktopEnvironment interface.
-  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<ScreenControls> CreateScreenControls() OVERRIDE;
+  virtual scoped_ptr<media::ScreenCapturer> CreateVideoCapturer() OVERRIDE;
 
  protected:
   friend class Me2MeDesktopEnvironmentFactory;
-  Me2MeDesktopEnvironment();
+  Me2MeDesktopEnvironment(
+      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);
 
  private:
   DISALLOW_COPY_AND_ASSIGN(Me2MeDesktopEnvironment);
@@ -32,13 +34,15 @@ class Me2MeDesktopEnvironment : public BasicDesktopEnvironment {
 // Used to create |Me2MeDesktopEnvironment| instances.
 class Me2MeDesktopEnvironmentFactory : public BasicDesktopEnvironmentFactory {
  public:
-  Me2MeDesktopEnvironmentFactory();
+  Me2MeDesktopEnvironmentFactory(
+      scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner,
+      scoped_refptr<base::SingleThreadTaskRunner> input_task_runner,
+      scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner);
   virtual ~Me2MeDesktopEnvironmentFactory();
 
   // DesktopEnvironmentFactory interface.
   virtual scoped_ptr<DesktopEnvironment> Create(
-      const std::string& client_jid,
-      const base::Closure& disconnect_callback) OVERRIDE;
+      base::WeakPtr<ClientSessionControl> client_session_control) OVERRIDE;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(Me2MeDesktopEnvironmentFactory);