summaryrefslogtreecommitdiffstats
path: root/base
diff options
context:
space:
mode:
authortonyg@chromium.org <tonyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-21 03:19:56 +0000
committertonyg@chromium.org <tonyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-21 03:19:56 +0000
commit8a789e48a7b3bd154dfeb9d49e0542772013d4f7 (patch)
tree7e88016874da2f2f64836329746ccff3e44b6e97 /base
parente2f2993d5fc46a43e5c800c7b6f754487ba24927 (diff)
downloadchromium_src-8a789e48a7b3bd154dfeb9d49e0542772013d4f7.zip
chromium_src-8a789e48a7b3bd154dfeb9d49e0542772013d4f7.tar.gz
chromium_src-8a789e48a7b3bd154dfeb9d49e0542772013d4f7.tar.bz2
Restore previous large_test_timeout_ms.
It was lowered for release builds by r169997 and since then the database page cycler has been frequently timing out. BUG=166984 TEST=None Review URL: https://chromiumcodereview.appspot.com/11647023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@174336 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
-rw-r--r--base/test/test_timeouts.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/base/test/test_timeouts.cc b/base/test/test_timeouts.cc
index b3fb968..344c514 100644
--- a/base/test/test_timeouts.cc
+++ b/base/test/test_timeouts.cc
@@ -56,11 +56,10 @@ 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
+int TestTimeouts::large_test_timeout_ms_ = 10 * 60 * 1000;
// static
void TestTimeouts::Initialize() {