summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-11 18:41:44 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-11 18:41:44 +0000
commit061ef0a7ec2e5fd7732100cbb2389f97c73180de (patch)
tree59a270515ebeec0d61425fc9dd0946fb07f7fdd4
parente05332fcc690943bfaff938acf5570ba9a8cb7ab (diff)
downloadchromium_src-061ef0a7ec2e5fd7732100cbb2389f97c73180de.zip
chromium_src-061ef0a7ec2e5fd7732100cbb2389f97c73180de.tar.gz
chromium_src-061ef0a7ec2e5fd7732100cbb2389f97c73180de.tar.bz2
GTTF: Lower timeouts.
BUG=none Review URL: https://codereview.chromium.org/11442027 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@172358 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--base/test/test_timeouts.cc5
1 files changed, 0 insertions, 5 deletions
diff --git a/base/test/test_timeouts.cc b/base/test/test_timeouts.cc
index b3fb968..a134891 100644
--- a/base/test/test_timeouts.cc
+++ b/base/test/test_timeouts.cc
@@ -54,13 +54,8 @@ bool TestTimeouts::initialized_ = false;
// static
int TestTimeouts::tiny_timeout_ms_ = 100;
int TestTimeouts::action_timeout_ms_ = 10000;
-#ifndef NDEBUG
-int TestTimeouts::action_max_timeout_ms_ = 45000;
-int TestTimeouts::large_test_timeout_ms_ = 10 * 60 * 1000;
-#else
int TestTimeouts::action_max_timeout_ms_ = 30000;
int TestTimeouts::large_test_timeout_ms_ = 10 * 45 * 1000;
-#endif // NDEBUG
// static
void TestTimeouts::Initialize() {