Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3210)

Unified Diff: chrome/test/perf/frame_rate/frame_rate_tests.cc

Issue 10787010: Switch to TimeDelta interfaces in chrome automation test infrastructure. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Rebase onto master. Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/test/perf/dromaeo_benchmark_uitest.cc ('k') | chrome/test/perf/indexeddb_uitest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/perf/frame_rate/frame_rate_tests.cc
diff --git a/chrome/test/perf/frame_rate/frame_rate_tests.cc b/chrome/test/perf/frame_rate/frame_rate_tests.cc
index 8392a2d7aa49f1a84ec29ddca3e75d93046a6f9a..865bc927f8620869fd54783de943270a74b6d7dd 100644
--- a/chrome/test/perf/frame_rate/frame_rate_tests.cc
+++ b/chrome/test/perf/frame_rate/frame_rate_tests.cc
@@ -191,7 +191,7 @@ class FrameRateTest
// 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(
@@ -204,7 +204,7 @@ class FrameRateTest
// 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)) {
« no previous file with comments | « chrome/test/perf/dromaeo_benchmark_uitest.cc ('k') | chrome/test/perf/indexeddb_uitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698