Fix bug 23303: ui_tests crash Windows 7's shell when running WorkerHttpLayout...

chrome/test/ui/ui_test.cc

Index: chrome/test/ui/ui_test.cc
===================================================================
--- chrome/test/ui/ui_test.cc	(revision 28000)
+++ chrome/test/ui/ui_test.cc	(working copy)
@@ -17,6 +17,9 @@
 #include "base/string_util.h"
 #include "base/test_file_util.h"
 #include "base/time.h"
+#if defined(OS_WIN)

[jam, 2009/10/05 19:31:28]

nit: I believe we always put the OS specific defines after the main #include
block.

+#include "base/win_util.h"
+#endif
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/net/url_fixer_upper.h"
 #include "chrome/common/chrome_constants.h"
@@ -307,6 +310,15 @@
   cmd_line->AppendSwitchWithValue(L"server", L"start");
   cmd_line->AppendSwitch(L"register_cygwin");
   cmd_line->AppendSwitchWithValue(L"root", root_directory.ToWStringHack());
+
+  // For Windows 7, if we start the lighttpd server on the foreground mode,
+  // it will mess up with the command window and cause conhost.exe to crash. To
+  // work around this, we start the http server on the background mode.
+#if defined(OS_WIN)
+  if (win_util::GetWinVersion() >= win_util::WINVERSION_WIN7)
+    cmd_line->AppendSwitch(L"run_background");
+#endif
+
   RunCommand(*cmd_line.get());
 }