summaryrefslogtreecommitdiffstats
path: root/chrome/test/test_timeouts.h
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-14 19:07:45 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-14 19:07:45 +0000
commitce8bac8fa733c584a659665606f694a4835f1fbf (patch)
tree65d37d9fb37d9b40ddc76d8236c0a4bc05a5db9f /chrome/test/test_timeouts.h
parentf3da4e1a1804845ad62364e7fe1cc66abda71e67 (diff)
downloadchromium_src-ce8bac8fa733c584a659665606f694a4835f1fbf.zip
chromium_src-ce8bac8fa733c584a659665606f694a4835f1fbf.tar.gz
chromium_src-ce8bac8fa733c584a659665606f694a4835f1fbf.tar.bz2
GTTF: Move browser_tests test launcher timeout to chrome/test/test_timeouts
BUG=none TEST=browser_tests Review URL: http://codereview.chromium.org/3327023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59409 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/test_timeouts.h')
-rw-r--r--chrome/test/test_timeouts.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/chrome/test/test_timeouts.h b/chrome/test/test_timeouts.h
index 8405a51..ef4a200c 100644
--- a/chrome/test/test_timeouts.h
+++ b/chrome/test/test_timeouts.h
@@ -24,6 +24,9 @@ class TestTimeouts {
// is not sufficient.
static int action_max_timeout_ms() { return action_max_timeout_ms_; }
+ // Timeout for a medium test (like one test inside browser_tests).
+ static int medium_test_timeout_ms() { return medium_test_timeout_ms_; }
+
// Timeout for a large test (like running a layout test inside the browser).
// Do not use unless absolutely necessary - try to make the test smaller.
// Do not use multiple times in a single test.
@@ -50,6 +53,7 @@ class TestTimeouts {
static int action_timeout_ms_;
static int action_max_timeout_ms_;
+ static int medium_test_timeout_ms_;
static int large_test_timeout_ms_;
static int sleep_timeout_ms_;
static int command_execution_timeout_ms_;