Remove obsolete test timeouts and convert callers.

chrome/test/gpu/webgl_conformance_tests.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/test/test_timeouts.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/test/automation/tab_proxy.h"
@@ skipping 49 matching lines @@
 
     ASSERT_EQ(AUTOMATION_MSG_NAVIGATION_SUCCESS,
               tab->NavigateToURL(net::FilePathToFileURL(test_path)));
 
     ASSERT_TRUE(tab->NavigateToURLAsync(
         GURL("javascript:start('" + url + "');")));
 
     // 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;
     ASSERT_TRUE(tab->ExecuteAndExtractString(
         L"",
         L"window.domAutomationController.send(JSON.stringify(result));",
         &result));
     ASSERT_TRUE(tab->ExecuteAndExtractString(
         L"",
         L"window.domAutomationController.send(message);",
         &message));
 
     EXPECT_EQ(WideToUTF8(result),"true") << WideToUTF8(message);
   }
 };
 
 #define CONFORMANCE_TEST(name, url) \
 TEST_F(WebGLConformanceTests, name) { \
   RunTest(url); \
 }
 
 // The test declarations are located in webgl_conformance_test_list_autogen.h,
 // because the list is automatically generated by a script.
 // See: generate_webgl_conformance_test_list.py
 #include "webgl_conformance_test_list_autogen.h"
 
 }  // namespace