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

chrome/test/ui/ui_test.cc

 // Copyright (c) 2006-2009 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.
 
 #include "chrome/test/ui/ui_test.h"
 
 #include <set>
 #include <vector>
 
 #include "base/base_switches.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/platform_thread.h"
 #include "base/process_util.h"
 #include "base/scoped_ptr.h"
 #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"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/debug_flags.h"
 #include "chrome/common/logging_chrome.h"
 #include "chrome/common/json_value_serializer.h"
 #include "chrome/test/automation/automation_messages.h"
 #include "chrome/test/automation/automation_proxy.h"
@@ skipping 270 matching lines @@
   base::LaunchApp(cmd_line, true, false, NULL);
 #endif
 }
 
 void UITest::StartHttpServer(const FilePath& root_directory) {
   scoped_ptr<CommandLine> cmd_line(CreateHttpServerCommandLine());
   ASSERT_TRUE(cmd_line.get());
   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());
 }
 
 void UITest::StopHttpServer() {
   scoped_ptr<CommandLine> cmd_line(CreateHttpServerCommandLine());
   ASSERT_TRUE(cmd_line.get());
   cmd_line->AppendSwitchWithValue(L"server", L"stop");
   RunCommand(*cmd_line.get());
 }
 
@@ skipping 803 matching lines @@
 #else
   // TODO(port): above code is very Windows-specific; we need to
   // figure out and abstract out how we'll handle finding any existing
   // running process, etc. on other platforms.
   NOTIMPLEMENTED();
 #endif
   }
 
   return true;
 }