chrome/android/javatests/src/org/chromium/chrome/browser/document/DocumentModeTestBase.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/document/DocumentModeTestBase.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/document/DocumentModeTest.java ('k') | chrome/android/javatests/src/org/chromium/chrome/browser/document/LauncherActivityTest.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/document/DocumentModeTestBase.java

diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/document/DocumentModeTestBase.java b/chrome/android/javatests/src/org/chromium/chrome/browser/document/DocumentModeTestBase.java

index b12dcdd1371f45d3b5df4f2576add884e55dbd29..1c8995e4e7cf5364c1edcce00fd278274122827a 100644

--- a/chrome/android/javatests/src/org/chromium/chrome/browser/document/DocumentModeTestBase.java

+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/document/DocumentModeTestBase.java

@@ -188,7 +188,7 @@ public class DocumentModeTestBase extends MultiActivityTestBase {

ApplicationTestUtils.waitUntilChromeInForeground();

// Wait until the selector is ready and the Tabs have been added to the DocumentTabModel.

- CriteriaHelper.pollForCriteria(new Criteria() {

+ CriteriaHelper.pollInstrumentationThread(new Criteria() {

@Override

public boolean isSatisfied() {

if (!ChromeApplication.isDocumentTabModelSelectorInitializedForTests()) {

@@ -229,7 +229,7 @@ public class DocumentModeTestBase extends MultiActivityTestBase {

openLinkInNewTabViaContextMenu(false, false);

- CriteriaHelper.pollForUIThreadCriteria(new Criteria() {

+ CriteriaHelper.pollUiThread(new Criteria() {

@Override

public boolean isSatisfied() {

if (expectedTabCount != tabModel.getCount()) return false;

@@ -273,7 +273,7 @@ public class DocumentModeTestBase extends MultiActivityTestBase {

}

});

TouchCommon.longPressView(view);

- CriteriaHelper.pollForUIThreadCriteria(new Criteria() {

+ CriteriaHelper.pollUiThread(new Criteria() {

@Override

public boolean isSatisfied() {

return observer.mContextMenu != null;

@@ -310,7 +310,7 @@ public class DocumentModeTestBase extends MultiActivityTestBase {

protected void switchToTab(final Tab tab) throws Exception {

final TabModel tabModel =

ChromeApplication.getDocumentTabModelSelector().getCurrentModel();

- CriteriaHelper.pollForCriteria(new Criteria() {

+ CriteriaHelper.pollInstrumentationThread(new Criteria() {

@Override

public boolean isSatisfied() {

// http://crbug.com/509866: TabModelUtils#setIndex() sometimes fails.