chrome/android/javatests/src/org/chromium/chrome/browser/partnercustomizations/PartnerDisableIncognitoModeIntegrationTest.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/partnercustomizations/PartnerDisableIncognitoModeIntegrationTest.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/omnibox/UrlBarTest.java ('k') | chrome/android/javatests/src/org/chromium/chrome/browser/partnercustomizations/PartnerHomepageIntegrationTest.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/partnercustomizations/PartnerDisableIncognitoModeIntegrationTest.java

diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/partnercustomizations/PartnerDisableIncognitoModeIntegrationTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/partnercustomizations/PartnerDisableIncognitoModeIntegrationTest.java

index 26d6ff2fcf2ab2031cfae007977dcd6816a27d0b..cebba5892946d093aad447f6d67df930d02cebc4 100644

--- a/chrome/android/javatests/src/org/chromium/chrome/browser/partnercustomizations/PartnerDisableIncognitoModeIntegrationTest.java

+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/partnercustomizations/PartnerDisableIncognitoModeIntegrationTest.java

@@ -70,7 +70,7 @@ public class PartnerDisableIncognitoModeIntegrationTest extends

private void waitForParentalControlsEnabledState(final boolean parentalControlsEnabled)

throws InterruptedException {

- CriteriaHelper.pollForUIThreadCriteria(new Criteria() {

+ CriteriaHelper.pollUiThread(new Criteria() {

@Override

public boolean isSatisfied() {

// areParentalControlsEnabled is updated on a background thread, so we

@@ -162,7 +162,7 @@ public class PartnerDisableIncognitoModeIntegrationTest extends

toggleActivityForegroundState();

waitForParentalControlsEnabledState(true);

- CriteriaHelper.pollForCriteria(Criteria.equals(0, new Callable<Integer>() {

+ CriteriaHelper.pollInstrumentationThread(Criteria.equals(0, new Callable<Integer>() {

@Override

public Integer call() {

return incognitoTabsCount();