Fixing threading issues in remoting::DesktopProcess. The UI thread is now owned by the caller of re…

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 "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/host/desktop_process.h"
 #include "remoting/host/host_exit_codes.h"
 #include "remoting/host/logging.h"
 #include "remoting/host/usage_stats_consent.h"
 
 #if defined(OS_MACOSX)
 #include "base/mac/scoped_nsautorelease_pool.h"
 #endif  // defined(OS_MACOSX)
 
 #if defined(OS_WIN)
@@ skipping 45 matching lines @@
   }
 
   std::string channel_name =
       command_line->GetSwitchValueASCII(kDaemonIpcSwitchName);
 
   if (channel_name.empty()) {
     Usage(command_line->GetProgram());
     return remoting::kUsageExitCode;
   }
 
-  remoting::DesktopProcess desktop_process(channel_name);
-  return desktop_process.Run();
+  MessageLoop message_loop(MessageLoop::TYPE_UI);
+  base::Closure quit_ui_task_runner = base::Bind(
+      base::IgnoreResult(&base::SingleThreadTaskRunner::PostTask),
+      message_loop.message_loop_proxy(),
+      FROM_HERE, MessageLoop::QuitClosure());

[Sergey Ulanov, 2012/10/25 20:29:32]

this should be RunLoop::QuitClosure() created by the RunLoop instance you use
below to run the loop.

[alexeypa (please no reviews), 2012/10/25 20:36:21]

Done.

+  scoped_refptr<remoting::AutoThreadTaskRunner> ui_task_runner =
+      new remoting::AutoThreadTaskRunner(message_loop.message_loop_proxy(),
+                                         quit_ui_task_runner);
+
+  remoting::DesktopProcess desktop_process(ui_task_runner, channel_name);
+  if (!desktop_process.Start())
+    return remoting::kInitializationFailed;
+
+  // Run the UI message loop.
+  ui_task_runner = NULL;
+  base::RunLoop run_loop;
+  run_loop.Run();
+
+  return remoting::kSuccessExitCode;
 }
 
 #if defined(OS_WIN)
 
 int CALLBACK WinMain(HINSTANCE instance,
                      HINSTANCE previous_instance,
                      LPSTR raw_command_line,
                      int show_command) {
 #ifdef OFFICIAL_BUILD
   if (remoting::IsUsageStatsAllowed()) {
@@ skipping 20 matching lines @@
             user32.GetFunctionPointer("SetProcessDPIAware"));
     set_process_dpi_aware();
   }
 
   // CommandLine::Init() ignores the passed |argc| and |argv| on Windows getting
   // the command line from GetCommandLineW(), so we can safely pass NULL here.
   return main(0, NULL);
 }
 
 #endif  // defined(OS_WIN)