chrome/test/perf/frame_rate/frame_rate_tests.cc - Issue 10736064: Switch to TimeDelta interfaces in chrome automation test infrastructure.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 10736064: Switch to TimeDelta interfaces in chrome automation test infrastructure. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: 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

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 ae8901938638db86ada3e15b0f664637850aad8a..cebc128f4de02f5558a85f45915aba168273df6f 100644

--- a/chrome/test/perf/frame_rate/frame_rate_tests.cc

+++ b/chrome/test/perf/frame_rate/frame_rate_tests.cc

@@ -194,7 +194,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(

@@ -207,7 +207,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 »