chrome/android/javatests/src/org/chromium/chrome/browser/ntp/NewTabPageTest.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: chrome/android/javatests/src/org/chromium/chrome/browser/ntp/NewTabPageTest.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 | « chrome/android/javatests/src/org/chromium/chrome/browser/ntp/DocumentModeRecentlyClosedTest.java ('k') | chrome/android/javatests/src/org/chromium/chrome/browser/offlinepages/OfflinePageBridgeTest.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/javatests/src/org/chromium/chrome/browser/ntp/NewTabPageTest.java

diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/ntp/NewTabPageTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/ntp/NewTabPageTest.java

index 54d0566053d2a53ab62155637cbc685cd034c68d..bfe2f263496405eba94bdfa501a36c551bee2c18 100644

--- a/chrome/android/javatests/src/org/chromium/chrome/browser/ntp/NewTabPageTest.java

+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/ntp/NewTabPageTest.java

@@ -301,7 +301,7 @@ public class NewTabPageTest extends ChromeTabbedActivityTestBase {

private void waitForUrlFocusAnimationsDisabledState(boolean disabled)

throws InterruptedException {

- CriteriaHelper.pollForCriteria(Criteria.equals(disabled, new Callable<Boolean>() {

+ CriteriaHelper.pollInstrumentationThread(Criteria.equals(disabled, new Callable<Boolean>() {

@Override

public Boolean call() {

return getUrlFocusAnimatonsDisabled();

@@ -310,7 +310,7 @@ public class NewTabPageTest extends ChromeTabbedActivityTestBase {

}

private void waitForTabLoading() throws InterruptedException {

- CriteriaHelper.pollForUIThreadCriteria(new Criteria() {

+ CriteriaHelper.pollUiThread(new Criteria() {

@Override

public boolean isSatisfied() {

return mTab.isLoading();

@@ -324,7 +324,7 @@ public class NewTabPageTest extends ChromeTabbedActivityTestBase {

private void waitForUrlFocusPercent(final NewTabPage ntp, float percent)

throws InterruptedException {

- CriteriaHelper.pollForUIThreadCriteria(Criteria.equals(percent, new Callable<Float>() {

+ CriteriaHelper.pollUiThread(Criteria.equals(percent, new Callable<Float>() {

@Override

public Float call() {

return ntp.getNewTabPageView().getUrlFocusChangeAnimationPercent();

@@ -357,7 +357,7 @@ public class NewTabPageTest extends ChromeTabbedActivityTestBase {

private void waitForFakeboxTopPosition(final NewTabPage ntp, int position)

throws InterruptedException {

- CriteriaHelper.pollForUIThreadCriteria(Criteria.equals(position, new Callable<Integer>() {

+ CriteriaHelper.pollUiThread(Criteria.equals(position, new Callable<Integer>() {

@Override

public Integer call() {

return getFakeboxTop(ntp);