Remove obsolete test timeouts and convert callers.

chrome/test/perf/frame_rate/frame_rate_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 <map>
 
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/string_number_conversions.h"
 #include "base/test/test_timeouts.h"
@@ skipping 36 matching lines @@
 
     ASSERT_EQ(AUTOMATION_MSG_NAVIGATION_SUCCESS,
               tab->NavigateToURL(net::FilePathToFileURL(test_path)));
 
     // Start the tests.
     ASSERT_TRUE(tab->NavigateToURLAsync(GURL("javascript:__start_all();")));
 
     // Block until the tests completes.
     ASSERT_TRUE(WaitUntilJavaScriptCondition(
         tab, L"", L"window.domAutomationController.send(!__running_all);",
-        TestTimeouts::huge_test_timeout_ms()));
+        TestTimeouts::large_test_timeout_ms()));
 
     // Read out the results.
     std::wstring json;
     ASSERT_TRUE(tab->ExecuteAndExtractString(
         L"",
         L"window.domAutomationController.send("
         L"JSON.stringify(__calc_results_total()));",
         &json));
 
     std::map<std::string, std::string> results;
@@ skipping 30 matching lines @@
 TEST_F(FrameRateTest, content) { \
   RunTest(#content, ""); \
 } \
 TEST_F(FrameRateTest_Reference, content) { \
   RunTest(#content, "_ref"); \
 }
 FRAME_RATE_TEST(blank);
 FRAME_RATE_TEST(googleblog);
 
 }  // namespace