summaryrefslogtreecommitdiffstats
path: root/chrome/test/ui/ui_test_suite.h
diff options
context:
space:
mode:
authorevanm@google.com <evanm@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-01-06 21:13:54 +0000
committerevanm@google.com <evanm@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-01-06 21:13:54 +0000
commit5e767712d2ebec5966472021c90f9700a8a6eda1 (patch)
tree4a72db9d768a5c5390654473f6036096db1db8f2 /chrome/test/ui/ui_test_suite.h
parentb8a0e36face3f8835bbf2efeb97502bc9bb50a1e (diff)
downloadchromium_src-5e767712d2ebec5966472021c90f9700a8a6eda1.zip
chromium_src-5e767712d2ebec5966472021c90f9700a8a6eda1.tar.gz
chromium_src-5e767712d2ebec5966472021c90f9700a8a6eda1.tar.bz2
Butcher some files to make ui_tests run 0 tests on Linux.
Review URL: http://codereview.chromium.org/16545 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7613 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/ui/ui_test_suite.h')
-rw-r--r--chrome/test/ui/ui_test_suite.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/test/ui/ui_test_suite.h b/chrome/test/ui/ui_test_suite.h
index e2976412e..b3d609f 100644
--- a/chrome/test/ui/ui_test_suite.h
+++ b/chrome/test/ui/ui_test_suite.h
@@ -42,7 +42,7 @@ class UITestSuite : public ChromeTestSuite {
std::wstring test_timeout =
parsed_command_line.GetSwitchValue(UITestSuite::kTestTimeout);
if (!test_timeout.empty()) {
- UITest::set_test_timeout_ms(_wtoi(test_timeout.c_str()));
+ UITest::set_test_timeout_ms(StringToInt(test_timeout));
}
std::wstring js_flags =
parsed_command_line.GetSwitchValue(switches::kJavaScriptFlags);
@@ -52,7 +52,9 @@ class UITestSuite : public ChromeTestSuite {
}
virtual void SuppressErrorDialogs() {
+#if defined(OS_WIN)
TestSuite::SuppressErrorDialogs();
+#endif
UITest::set_show_error_dialogs(false);
}