diff options
| author | rsimha@chromium.org <rsimha@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-08 17:21:20 +0000 |
|---|---|---|
| committer | rsimha@chromium.org <rsimha@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-08 17:21:20 +0000 |
| commit | a795f51893ce57f3257d80bc397fd82569fd2fc0 (patch) | |
| tree | f30e60eff2a1ef716528f4cc99031b88d61e9153 /base/test/test_switches.h | |
| parent | ae32ddf82b2d70c9f6902273df5d9a5fde59a2eb (diff) | |
| download | chromium_src-a795f51893ce57f3257d80bc397fd82569fd2fc0.zip chromium_src-a795f51893ce57f3257d80bc397fd82569fd2fc0.tar.gz chromium_src-a795f51893ce57f3257d80bc397fd82569fd2fc0.tar.bz2 | |
Revert 88111 - GTTF: Move --test-terminate-timeout logic to base/test/test_timeouts
Reason for revert: This patch causes --test-terminate-timeout to be disregarded by out_of_proc_test_runner.cc, resulting in redness on the sync buildbots.
This is the first step towards removing --test-terminate-timeout completely.
In this CL --test-terminate-timeout becomes a synonym for
--ui-test-action-max-timeout.
This makes it possible to switch callers to --ui-test-action-max-timeout
and remove --test-terminate-timeout.
Removing number of different kinds of timeouts makes it easier to pick one.
BUG=none
Review URL: http://codereview.chromium.org/7111035
TBR=phajdan.jr@chromium.org
Review URL: http://codereview.chromium.org/7104059
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@88352 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/test/test_switches.h')
| -rw-r--r-- | base/test/test_switches.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/base/test/test_switches.h b/base/test/test_switches.h index 5e4e8e2..81891cb6 100644 --- a/base/test/test_switches.h +++ b/base/test/test_switches.h @@ -11,7 +11,6 @@ namespace switches { // alongside the definition of their values in the .cc file. extern const char kLiveOperationTimeout[]; extern const char kTestLargeTimeout[]; -extern const char kTestTerminateTimeout[]; extern const char kTestTinyTimeout[]; extern const char kUiTestActionTimeout[]; extern const char kUiTestActionMaxTimeout[]; |