diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-19 16:35:54 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-19 16:35:54 +0000 |
| commit | 84e1dff96238dfede15aed36ee2a9bf5a71dd9f9 (patch) | |
| tree | f759071d37c3530bfe9a7a45d087a0c20c7f3091 /chrome/test/automated_ui_tests | |
| parent | dfa7406f877705d423d0fb63a9ea1a0001f0fbae (diff) | |
| download | chromium_src-84e1dff96238dfede15aed36ee2a9bf5a71dd9f9.zip chromium_src-84e1dff96238dfede15aed36ee2a9bf5a71dd9f9.tar.gz chromium_src-84e1dff96238dfede15aed36ee2a9bf5a71dd9f9.tar.bz2 | |
[GTTF] Make automation timeouts more sane.
Do not expose command execution timeout outside ui_test.cc. This way
people have less timeouts to choose from, which leaves less space
for confusion.
The option to manipulate the command execution timeout is still
available, because it's still used and makes sense.
Also updated misleading comments and names in ui_test.cc.
TEST=ui_tests
BUG=none
Review URL: http://codereview.chromium.org/1078003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42112 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/automated_ui_tests')
| -rw-r--r-- | chrome/test/automated_ui_tests/automated_ui_test_base.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/test/automated_ui_tests/automated_ui_test_base.cc b/chrome/test/automated_ui_tests/automated_ui_test_base.cc index 946f3da..9665aa3 100644 --- a/chrome/test/automated_ui_tests/automated_ui_test_base.cc +++ b/chrome/test/automated_ui_tests/automated_ui_test_base.cc @@ -312,7 +312,7 @@ bool AutomatedUITestBase::Navigate(const GURL& url) { } bool did_timeout = false; AutomationMsg_NavigationResponseValues result = - tab->NavigateToURLWithTimeout(url, 1, command_execution_timeout_ms(), + tab->NavigateToURLWithTimeout(url, 1, action_max_timeout_ms(), &did_timeout); if (result != AUTOMATION_MSG_NAVIGATION_SUCCESS) { LogErrorMessage("navigation_failed"); |