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

remoting/host/me2me_desktop_environment.cc

Index: remoting/host/me2me_desktop_environment.cc
diff --git a/remoting/host/me2me_desktop_environment.cc b/remoting/host/me2me_desktop_environment.cc
index 9b2b9afa69de16d3ada422a76754ee7ae33f5fe7..5764ac56b206ce9fbf6956e4a1869cb0a8d02de4 100644
--- a/remoting/host/me2me_desktop_environment.cc
+++ b/remoting/host/me2me_desktop_environment.cc
@@ -5,30 +5,29 @@
 #include "remoting/host/me2me_desktop_environment.h"
 
 #include "base/logging.h"
+#include "base/single_thread_task_runner.h"
 #include "media/video/capture/screen/screen_capturer.h"
+#include "remoting/host/client_session_control.h"
 #include "remoting/host/desktop_resizer.h"
 #include "remoting/host/resizing_host_observer.h"
-#include "remoting/host/session_controller.h"
+#include "remoting/host/screen_controls.h"
 
 namespace remoting {
 
 Me2MeDesktopEnvironment::~Me2MeDesktopEnvironment() {
-  DCHECK(CalledOnValidThread());
+  DCHECK(caller_task_runner()->BelongsToCurrentThread());
 }
 
-scoped_ptr<SessionController>
-Me2MeDesktopEnvironment::CreateSessionController() {
-  DCHECK(CalledOnValidThread());
+scoped_ptr<ScreenControls> Me2MeDesktopEnvironment::CreateScreenControls() {
+  DCHECK(caller_task_runner()->BelongsToCurrentThread());
 
-  scoped_ptr<SessionController> session_controller(
+  return scoped_ptr<ScreenControls>(
       new ResizingHostObserver(DesktopResizer::Create()));
-  return session_controller.Pass();
 }
 
-scoped_ptr<media::ScreenCapturer> Me2MeDesktopEnvironment::CreateVideoCapturer(
-    scoped_refptr<base::SingleThreadTaskRunner> capture_task_runner,
-    scoped_refptr<base::SingleThreadTaskRunner> encode_task_runner) {
-  DCHECK(CalledOnValidThread());
+scoped_ptr<media::ScreenCapturer>
+Me2MeDesktopEnvironment::CreateVideoCapturer() {
+  DCHECK(caller_task_runner()->BelongsToCurrentThread());
 
 #if defined(OS_LINUX)
   return media::ScreenCapturer::CreateWithXDamage(true);
@@ -37,19 +36,39 @@ scoped_ptr<media::ScreenCapturer> Me2MeDesktopEnvironment::CreateVideoCapturer(
 #endif  // !defined(OS_LINUX)
 }
 
-Me2MeDesktopEnvironment::Me2MeDesktopEnvironment() {
+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)
+    : BasicDesktopEnvironment(caller_task_runner,
+                              input_task_runner,
+                              ui_task_runner,
+                              client_session_control) {
+  DCHECK(caller_task_runner->BelongsToCurrentThread());
 }
 
-Me2MeDesktopEnvironmentFactory::Me2MeDesktopEnvironmentFactory() {
+Me2MeDesktopEnvironmentFactory::Me2MeDesktopEnvironmentFactory(
+    scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner,
+    scoped_refptr<base::SingleThreadTaskRunner> input_task_runner,
+    scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner)
+    : BasicDesktopEnvironmentFactory(caller_task_runner,
+                                     input_task_runner,
+                                     ui_task_runner) {
 }
 
 Me2MeDesktopEnvironmentFactory::~Me2MeDesktopEnvironmentFactory() {
 }
 
 scoped_ptr<DesktopEnvironment> Me2MeDesktopEnvironmentFactory::Create(
-    const std::string& client_jid,
-    const base::Closure& disconnect_callback) {
-  return scoped_ptr<DesktopEnvironment>(new Me2MeDesktopEnvironment());
+    base::WeakPtr<ClientSessionControl> client_session_control) {
+  DCHECK(caller_task_runner()->BelongsToCurrentThread());
+
+  return scoped_ptr<DesktopEnvironment>(
+      new Me2MeDesktopEnvironment(caller_task_runner(),
+                                  input_task_runner(),
+                                  ui_task_runner(),
+                                  client_session_control));
 }
 
 }  // namespace remoting