Pass a DesktopEnvironmentFactory when creating DesktopProcess.

remoting/host/desktop_process_main.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
 // This file implements the Windows service controlling Me2Me host processes
 // running within user sessions.
 
 #include "remoting/host/desktop_process_main.h"
 
 #include "base/at_exit.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/message_loop.h"
 #include "base/run_loop.h"
 #include "base/scoped_native_library.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "base/win/windows_version.h"
 #include "remoting/base/auto_thread_task_runner.h"
 #include "remoting/base/breakpad.h"
+#include "remoting/host/basic_desktop_environment.h"
 #include "remoting/host/desktop_process.h"
 #include "remoting/host/host_exit_codes.h"
 #include "remoting/host/logging.h"
 #include "remoting/host/usage_stats_consent.h"
+#include "remoting/host/win/session_desktop_environment.h"
 
 #if defined(OS_MACOSX)
 #include "base/mac/scoped_nsautorelease_pool.h"
 #endif  // defined(OS_MACOSX)
 
 #if defined(OS_WIN)
 #include <commctrl.h>
 #endif  // defined(OS_WIN)
 
 namespace {
@@ skipping 85 matching lines @@
   base::RunLoop run_loop;
   base::Closure quit_ui_task_runner = base::Bind(
       base::IgnoreResult(&base::SingleThreadTaskRunner::PostTask),
       message_loop.message_loop_proxy(),
       FROM_HERE, run_loop.QuitClosure());
   scoped_refptr<AutoThreadTaskRunner> ui_task_runner =
       new AutoThreadTaskRunner(message_loop.message_loop_proxy(),
                                quit_ui_task_runner);
 
   DesktopProcess desktop_process(ui_task_runner, channel_name);
-  if (!desktop_process.Start())
+
+  // Create proper kind of desktop environment factory.

[Wez, 2013/02/01 01:02:11]

nit: "... proper kind of ..." -> "... platform-dependent ..."?

[alexeypa (please no reviews), 2013/02/01 17:28:43]

Done.

+  scoped_ptr<DesktopEnvironmentFactory> desktop_environment_factory;
+#if defined(OS_WIN)
+  desktop_environment_factory.reset(new SessionDesktopEnvironmentFactory(
+      base::Bind(&DesktopProcess::InjectSas, desktop_process.AsWeakPtr())));
+#else  // !defined(OS_WIN)
+  desktop_environment_factory.reset(new BasicDesktopEnvironmentFactory());
+#endif  // !defined(OS_WIN)
+
+  if (!desktop_process.Start(desktop_environment_factory.Pass()))
     return kInitializationFailed;
 
   // Run the UI message loop.
   ui_task_runner = NULL;
   run_loop.Run();
 
   return kSuccessExitCode;
 }
 
 }  // namespace remoting
 
 #if !defined(OS_WIN)
 int main(int argc, char** argv) {
   return remoting::DesktopProcessMain(argc, argv);
 }
 #endif  // !defined(OS_WIN)