summaryrefslogtreecommitdiffstats
path: root/webkit/tools/test_shell/test_shell_mac.mm
diff options
context:
space:
mode:
authorerg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-11-19 19:37:04 +0000
committererg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-11-19 19:37:04 +0000
commitad4996c5bae5ebb89eb893d49a5802f7e8a9e543 (patch)
tree6455d2224bac8b67e75cb08845dd5681760d3a0f /webkit/tools/test_shell/test_shell_mac.mm
parentd92c63f171edb6857fb63222f89109afa1b71a5e (diff)
downloadchromium_src-ad4996c5bae5ebb89eb893d49a5802f7e8a9e543.zip
chromium_src-ad4996c5bae5ebb89eb893d49a5802f7e8a9e543.tar.gz
chromium_src-ad4996c5bae5ebb89eb893d49a5802f7e8a9e543.tar.bz2
Only have one constant for timeout time.
Review URL: http://codereview.chromium.org/11257 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5698 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/test_shell/test_shell_mac.mm')
-rw-r--r--webkit/tools/test_shell/test_shell_mac.mm2
1 files changed, 1 insertions, 1 deletions
diff --git a/webkit/tools/test_shell/test_shell_mac.mm b/webkit/tools/test_shell/test_shell_mac.mm
index c92262c..abc82cc 100644
--- a/webkit/tools/test_shell/test_shell_mac.mm
+++ b/webkit/tools/test_shell/test_shell_mac.mm
@@ -320,7 +320,7 @@ void TestShell::WaitTestFinished() {
// shell, which is unfortunate.
// Windows multiplies by 2.5, but that causes us to run for far, far too
// long. We can adjust it down later if we need to.
- NSTimeInterval timeout_seconds = GetFileTestTimeout() / 1000;
+ NSTimeInterval timeout_seconds = GetLayoutTestTimeoutInSeconds();
WatchDogTarget* watchdog = [[[WatchDogTarget alloc]
initWithTimeout:timeout_seconds] autorelease];
NSThread* thread = [[NSThread alloc] initWithTarget:watchdog