Making DesktopEnvironment a factory class used by ClientSession to create audio/video capturers and…

remoting/host/desktop_environment_factory.cc

Index: remoting/host/desktop_environment_factory.cc
diff --git a/remoting/host/desktop_environment_factory.cc b/remoting/host/desktop_environment_factory.cc
index 893c0ccafa90dbf60e502f6e0caea0da2ee0fcac..ff0e329cdb3dbaa4ba61b5e09147418cbea1b334 100644
--- a/remoting/host/desktop_environment_factory.cc
+++ b/remoting/host/desktop_environment_factory.cc
@@ -4,31 +4,31 @@
 
 #include "remoting/host/desktop_environment_factory.h"
 
+#include "base/bind.h"
+#include "base/memory/scoped_ptr.h"
 #include "base/single_thread_task_runner.h"
-#include "remoting/capturer/video_frame_capturer.h"
 #include "remoting/host/audio_capturer.h"
-#include "remoting/host/chromoting_host_context.h"
-#include "remoting/host/desktop_environment.h"
 #include "remoting/host/event_executor.h"
+#include "remoting/host/local_desktop_environment.h"
 
 namespace remoting {
 
 DesktopEnvironmentFactory::DesktopEnvironmentFactory(
-    scoped_refptr<base::SingleThreadTaskRunner> input_task_runner,
-    scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner)
-    : input_task_runner_(input_task_runner),
-      ui_task_runner_(ui_task_runner) {
+    scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner)
+    : caller_task_runner_(caller_task_runner) {
 }
 
 DesktopEnvironmentFactory::~DesktopEnvironmentFactory() {
 }
 
-scoped_ptr<DesktopEnvironment> DesktopEnvironmentFactory::Create() {
-  scoped_ptr<DesktopEnvironment> environment(new DesktopEnvironment(
-      AudioCapturer::Create(),
-      EventExecutor::Create(input_task_runner_, ui_task_runner_),
-      VideoFrameCapturer::Create()));
-  return environment.Pass();
+scoped_ptr<DesktopEnvironment> DesktopEnvironmentFactory::Create(
+    const std::string& client_jid,
+    const base::Closure& disconnect_callback) {
+  DCHECK(caller_task_runner()->BelongsToCurrentThread());
+
+  return scoped_ptr<DesktopEnvironment>(
+      new LocalDesktopEnvironment(caller_task_runner(),
+                                  base::Bind(&EventExecutor::Create)));
 }
 
 bool DesktopEnvironmentFactory::SupportsAudioCapture() const {