Switch to TimeDelta interfaces in chrome automation test infrastructure.

chrome/test/perf/frame_rate/frame_rate_tests.cc

 // Copyright (c) 2012 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/command_line.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/string_number_conversions.h"
@@ skipping 173 matching lines @@
       ASSERT_EQ(AUTOMATION_MSG_NAVIGATION_SUCCESS,
         tab->NavigateToURL(net::FilePathToFileURL(test_path)));
     }
 
     // Block until initialization completes
     // If the following assertion fails intermittently, it could be due to a
     // race condition caused by an html redirect. If that is the case, verify
     // that flag kHasRedirect is enabled for the current test.
     ASSERT_TRUE(WaitUntilJavaScriptCondition(
       tab, L"", L"window.domAutomationController.send(__initialized);",
-      TestTimeouts::large_test_timeout_ms()));
+      TestTimeouts::large_test_timeout()));
 
     if (HasFlag(kForceGpuComposited)) {
       ASSERT_TRUE(tab->NavigateToURLAsync(
         GURL("javascript:__make_body_composited();")));
     }
 
     // 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::large_test_timeout_ms()));
+        TestTimeouts::large_test_timeout()));
 
     // TODO(jbates): remove this check when ref builds are updated.
     if (!HasFlag(kUseReferenceBuild)) {
       std::string json_events;
       ASSERT_TRUE(automation()->EndTracing(&json_events));
 
       bool did_run_on_gpu = DidRunOnGpu(json_events);
       bool expect_gpu = HasFlag(kUseGpu);
       EXPECT_EQ(expect_gpu, did_run_on_gpu);
     }
@@ skipping 86 matching lines @@
     kIsGpuCanvasTest | kInternal | kHasRedirect | kUseGpu | kDisableVsync,
     kIsGpuCanvasTest | kUseReferenceBuild | kInternal | kHasRedirect | kUseGpu,
     kIsGpuCanvasTest | kUseReferenceBuild | kInternal | kHasRedirect | kUseGpu |
         kDisableVsync));
 
 INTERNAL_FRAME_RATE_TEST_CANVAS_GPU(fireflies)
 INTERNAL_FRAME_RATE_TEST_CANVAS_GPU(FishIE)
 INTERNAL_FRAME_RATE_TEST_CANVAS_GPU(speedreading)
 
 }  // namespace