content/public/android/javatests/src/org/chromium/content/browser/ContentViewScrollingTest.java - Issue 1786243003: Rename pollForCriteria to pollForTestThreadCriteria.

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: content/public/android/javatests/src/org/chromium/content/browser/ContentViewScrollingTest.java

Issue 1786243003: Rename pollForCriteria to pollForTestThreadCriteria. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase and update MediaRouterIntegrationTest.java Created 4 years, 9 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 | « content/public/android/javatests/src/org/chromium/content/browser/ContentViewPopupZoomerTest.java ('k') | content/public/android/javatests/src/org/chromium/content/browser/GestureDetectorResetTest.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/public/android/javatests/src/org/chromium/content/browser/ContentViewScrollingTest.java

diff --git a/content/public/android/javatests/src/org/chromium/content/browser/ContentViewScrollingTest.java b/content/public/android/javatests/src/org/chromium/content/browser/ContentViewScrollingTest.java

index 6c0fda1360c033ee8737d2b328fc8996e0d73090..0356e83c20128386053ff7f44519e39f92d209c5 100644

--- a/content/public/android/javatests/src/org/chromium/content/browser/ContentViewScrollingTest.java

+++ b/content/public/android/javatests/src/org/chromium/content/browser/ContentViewScrollingTest.java

@@ -92,7 +92,7 @@ public class ContentViewScrollingTest extends ContentShellTestBase {

private void assertWaitForScroll(final boolean hugLeft, final boolean hugTop)

throws InterruptedException {

- CriteriaHelper.pollForCriteria(new Criteria() {

+ CriteriaHelper.pollInstrumentationThread(new Criteria() {

@Override

public boolean isSatisfied() {

// Scrolling and flinging don't result in exact coordinates.

@@ -329,7 +329,7 @@ public class ContentViewScrollingTest extends ContentShellTestBase {

});

scrollTo(scrollToX, scrollToY);

assertWaitForScroll(false, false);

- CriteriaHelper.pollForCriteria(new Criteria() {

+ CriteriaHelper.pollInstrumentationThread(new Criteria() {

@Override

public boolean isSatisfied() {

return containerViewInternals.isScrollChanged();