Pass a DesktopEnvironmentFactory when creating DesktopProcess.

remoting/host/desktop_process.cc

Index: remoting/host/desktop_process.cc
diff --git a/remoting/host/desktop_process.cc b/remoting/host/desktop_process.cc
index 67eb7dde0c3ceb9b35ee21b3216ed9566b05be3e..2785a29688604b59f12c3db4fdfa1630da06586f 100644
--- a/remoting/host/desktop_process.cc
+++ b/remoting/host/desktop_process.cc
@@ -16,6 +16,7 @@
 #include "remoting/base/auto_thread.h"
 #include "remoting/base/auto_thread_task_runner.h"
 #include "remoting/host/chromoting_messages.h"
+#include "remoting/host/desktop_environment.h"
 #include "remoting/host/desktop_session_agent.h"
 
 namespace remoting {
@@ -34,6 +35,12 @@ DesktopProcess::~DesktopProcess() {
   DCHECK(!desktop_agent_);
 }
 
+DesktopEnvironmentFactory& DesktopProcess::desktop_environment_factory() {
+  DCHECK(caller_task_runner_->BelongsToCurrentThread());
+
+  return *desktop_environment_factory_;
+}
+
 void DesktopProcess::OnNetworkProcessDisconnected() {
   DCHECK(caller_task_runner_->BelongsToCurrentThread());
 
@@ -73,8 +80,13 @@ void DesktopProcess::OnChannelError() {
   caller_task_runner_ = NULL;
 }
 
-bool DesktopProcess::Start() {
+bool DesktopProcess::Start(
+    scoped_ptr<DesktopEnvironmentFactory> desktop_environment_factory) {
   DCHECK(caller_task_runner_->BelongsToCurrentThread());
+  DCHECK(!desktop_environment_factory_);
+  DCHECK(desktop_environment_factory);
+
+  desktop_environment_factory_ = desktop_environment_factory.Pass();
 
   // Launch the audio capturing thread.
   scoped_refptr<AutoThreadTaskRunner> audio_task_runner;