summaryrefslogtreecommitdiffstats
path: root/chrome/test/gpu
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-25 19:40:01 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-25 19:40:01 +0000
commit7a2b60825bfee6abe4f59b930e9f1e09e40cb1da (patch)
treedc419a3fd4dddf180cbd1af020cebf4de19ddedb /chrome/test/gpu
parent8473902467aed029aff0ca4d8b48311e52590381 (diff)
downloadchromium_src-7a2b60825bfee6abe4f59b930e9f1e09e40cb1da.zip
chromium_src-7a2b60825bfee6abe4f59b930e9f1e09e40cb1da.tar.gz
chromium_src-7a2b60825bfee6abe4f59b930e9f1e09e40cb1da.tar.bz2
Remove obsolete test timeouts and convert callers.
This will make it easier to choose the right timeout. BUG=none Review URL: http://codereview.chromium.org/7744031 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98273 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/gpu')
-rw-r--r--chrome/test/gpu/webgl_conformance_tests.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/test/gpu/webgl_conformance_tests.cc b/chrome/test/gpu/webgl_conformance_tests.cc
index 5ad9bc8..103a841 100644
--- a/chrome/test/gpu/webgl_conformance_tests.cc
+++ b/chrome/test/gpu/webgl_conformance_tests.cc
@@ -67,7 +67,7 @@ class WebGLConformanceTests : public UITest {
// Block until the test completes.
ASSERT_TRUE(WaitUntilJavaScriptCondition(
tab, L"", L"window.domAutomationController.send(!running);",
- TestTimeouts::huge_test_timeout_ms()));
+ TestTimeouts::large_test_timeout_ms()));
// Read out the test result.
std::wstring result, message;