Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(44)

Unified Diff: chrome/test/ui/ui_test_suite.h

Issue 39282: Start the crash_service on windows when running ui tests, if it's not running... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/process_util_win.cc ('k') | chrome/test/ui/ui_test_suite.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/ui/ui_test_suite.h
===================================================================
--- chrome/test/ui/ui_test_suite.h (revision 11070)
+++ chrome/test/ui/ui_test_suite.h (working copy)
@@ -5,63 +5,28 @@
#ifndef CHROME_TEST_UI_UI_TEST_SUITE_H_
#define CHROME_TEST_UI_UI_TEST_SUITE_H_
+#include "base/process.h"
#include "chrome/test/ui/ui_test.h"
#include "chrome/test/unit/chrome_test_suite.h"
class UITestSuite : public ChromeTestSuite {
public:
- UITestSuite(int argc, char** argv) : ChromeTestSuite(argc, argv) {
- }
+ UITestSuite(int argc, char** argv);
protected:
+ virtual void Initialize();
- virtual void Initialize() {
- ChromeTestSuite::Initialize();
+ virtual void Shutdown();
- const CommandLine& parsed_command_line = *CommandLine::ForCurrentProcess();
- UITest::set_in_process_renderer(
- parsed_command_line.HasSwitch(switches::kSingleProcess));
- UITest::set_no_sandbox(
- parsed_command_line.HasSwitch(switches::kNoSandbox));
- UITest::set_full_memory_dump(
- parsed_command_line.HasSwitch(switches::kFullMemoryCrashReport));
- UITest::set_safe_plugins(
- parsed_command_line.HasSwitch(switches::kSafePlugins));
- UITest::set_use_existing_browser(
- parsed_command_line.HasSwitch(UITestSuite::kUseExistingBrowser));
- UITest::set_dump_histograms_on_exit(
- parsed_command_line.HasSwitch(switches::kDumpHistogramsOnExit));
- UITest::set_enable_dcheck(
- parsed_command_line.HasSwitch(switches::kEnableDCHECK));
- UITest::set_silent_dump_on_dcheck(
- parsed_command_line.HasSwitch(switches::kSilentDumpOnDCHECK));
- UITest::set_disable_breakpad(
- parsed_command_line.HasSwitch(switches::kDisableBreakpad));
- std::wstring test_timeout =
- parsed_command_line.GetSwitchValue(UITestSuite::kTestTimeout);
- if (!test_timeout.empty()) {
- UITest::set_test_timeout_ms(StringToInt(WideToUTF16Hack(test_timeout)));
- }
- std::wstring js_flags =
- parsed_command_line.GetSwitchValue(switches::kJavaScriptFlags);
- if (!js_flags.empty()) {
- UITest::set_js_flags(js_flags);
- }
- std::wstring log_level =
- parsed_command_line.GetSwitchValue(switches::kLoggingLevel);
- if (!log_level.empty()) {
- UITest::set_log_level(log_level);
- }
- }
+ virtual void SuppressErrorDialogs();
- virtual void SuppressErrorDialogs() {
+ private:
#if defined(OS_WIN)
- TestSuite::SuppressErrorDialogs();
+ void LoadCrashService();
+
+ base::ProcessHandle crash_service_;
#endif
- UITest::set_show_error_dialogs(false);
- }
- private:
static const wchar_t kUseExistingBrowser[];
static const wchar_t kTestTimeout[];
};
« no previous file with comments | « base/process_util_win.cc ('k') | chrome/test/ui/ui_test_suite.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698