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

remoting/host/desktop_process_unittest.cc

Index: remoting/host/desktop_process_unittest.cc
diff --git a/remoting/host/desktop_process_unittest.cc b/remoting/host/desktop_process_unittest.cc
index 759dacc7ba36f2160076557a40aa3fc315ff7e75..5814244bd9476c784de479003961b24d051d4e2a 100644
--- a/remoting/host/desktop_process_unittest.cc
+++ b/remoting/host/desktop_process_unittest.cc
@@ -112,10 +112,6 @@ class DesktopProcessTest : public testing::Test {
   // DesktopEnvironment::CreateInputInjector().
   InputInjector* CreateInputInjector();
 
-  // Creates a dummy SessionController, to mock
-  // DesktopEnvironment::CreateSessionController().
-  SessionController* CreateSessionController();
-
   // Creates a fake media::ScreenCapturer, to mock
   // DesktopEnvironment::CreateVideoCapturer().
   media::ScreenCapturer* CreateVideoCapturer();
@@ -199,21 +195,16 @@ void DesktopProcessTest::OnDesktopAttached(
 
 DesktopEnvironment* DesktopProcessTest::CreateDesktopEnvironment() {
   MockDesktopEnvironment* desktop_environment = new MockDesktopEnvironment();
-  EXPECT_CALL(*desktop_environment, CreateAudioCapturerPtr(_))
+  EXPECT_CALL(*desktop_environment, CreateAudioCapturerPtr())
       .Times(0);
-  EXPECT_CALL(*desktop_environment, CreateInputInjectorPtr(_, _))
-      .Times(AnyNumber())
-      .WillRepeatedly(
-          InvokeWithoutArgs(this, &DesktopProcessTest::CreateInputInjector));
-  EXPECT_CALL(*desktop_environment, CreateSessionControllerPtr())
+  EXPECT_CALL(*desktop_environment, CreateInputInjectorPtr())
       .Times(AnyNumber())
-      .WillRepeatedly(
-          InvokeWithoutArgs(this,
-                            &DesktopProcessTest::CreateSessionController));
-  EXPECT_CALL(*desktop_environment, CreateVideoCapturerPtr(_, _))
+      .WillRepeatedly(Invoke(this, &DesktopProcessTest::CreateInputInjector));
+  EXPECT_CALL(*desktop_environment, CreateScreenControlsPtr())
+      .Times(AnyNumber());
+  EXPECT_CALL(*desktop_environment, CreateVideoCapturerPtr())
       .Times(AnyNumber())
-      .WillRepeatedly(
-          InvokeWithoutArgs(this, &DesktopProcessTest::CreateVideoCapturer));
+      .WillRepeatedly(Invoke(this, &DesktopProcessTest::CreateVideoCapturer));
 
   // Notify the test that the desktop environment has been created.
   network_listener_.OnDesktopEnvironmentCreated();
@@ -226,10 +217,6 @@ InputInjector* DesktopProcessTest::CreateInputInjector() {
   return input_injector;
 }
 
-SessionController* DesktopProcessTest::CreateSessionController() {
-  return new MockSessionController();
-}
-
 media::ScreenCapturer* DesktopProcessTest::CreateVideoCapturer() {
   return new media::ScreenCapturerFake();
 }
@@ -274,7 +261,7 @@ void DesktopProcessTest::RunDesktopProcess() {
       .Times(AnyNumber())
       .WillRepeatedly(Return(false));
 
-  DesktopProcess desktop_process(ui_task_runner, channel_name);
+  DesktopProcess desktop_process(ui_task_runner, io_task_runner_, channel_name);
   EXPECT_TRUE(desktop_process.Start(
       desktop_environment_factory.PassAs<DesktopEnvironmentFactory>()));