diff options
| author | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-16 17:10:02 +0000 |
|---|---|---|
| committer | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-16 17:10:02 +0000 |
| commit | 9f16f9fb94d4f2a7963e759f3ca712df30d74fff (patch) | |
| tree | e37457cf1568a36f007f5b7a751b7a1af95f8c4c /chrome/test/test_switches.cc | |
| parent | 3b27adfc7ed75f2b5501039895ea9ec05f7266df (diff) | |
| download | chromium_src-9f16f9fb94d4f2a7963e759f3ca712df30d74fff.zip chromium_src-9f16f9fb94d4f2a7963e759f3ca712df30d74fff.tar.gz chromium_src-9f16f9fb94d4f2a7963e759f3ca712df30d74fff.tar.bz2 | |
Add testing of the Chrome Frame user-mode installation to mini_installer_tests.exe.
Also do some miscellaneous cleanup and rejiggering such as removing test-only constants from chrome\common, adding more useful prints when tests fail, properly waiting for child processes to terminate and moving a timeout value to test_timeouts.cc in test_support_common.
BUG=53127
TEST=Chrome Frame user level installs are tested.
Review URL: http://codereview.chromium.org/3297026
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59675 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/test_switches.cc')
| -rw-r--r-- | chrome/test/test_switches.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/chrome/test/test_switches.cc b/chrome/test/test_switches.cc index 3eb1dd2..f6b0336 100644 --- a/chrome/test/test_switches.cc +++ b/chrome/test/test_switches.cc @@ -18,6 +18,7 @@ const char switches::kPageCyclerIterations[] = "page-cycler-iterations"; // Time (in milliseconds) that the ui_tests should wait before timing out. // TODO(phajdan.jr): Clean up the switch names. +const char switches::kTestLargeTimeout[] = "test-large-timeout"; const char switches::kUiTestActionTimeout[] = "ui-test-action-timeout"; const char switches::kUiTestActionMaxTimeout[] = "ui-test-action-max-timeout"; const char switches::kUiTestCommandExecutionTimeout[] = "ui-test-timeout"; |