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

Unified Diff: content/public/android/javatests/src/org/chromium/content/browser/ContentViewCoreSelectionTest.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/ClipboardTest.java ('k') | content/public/android/javatests/src/org/chromium/content/browser/ContentViewLocationTest.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/ContentViewCoreSelectionTest.java

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

index 359d8e9f107bfd665d12eb93c1c1850ee534fdcf..b62c8454026862b9fd77627474e181d1ae9845bb 100644

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

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

@@ -468,7 +468,7 @@ public class ContentViewCoreSelectionTest extends ContentShellTestBase {

assertEquals(mContentViewCore.getSelectedText(), "SampleTextArea");

hideSelectActionMode();

waitForSelectActionBarVisible(false);

- CriteriaHelper.pollForCriteria(

+ CriteriaHelper.pollInstrumentationThread(

Criteria.equals("SampleTextArea", new Callable<CharSequence>() {

@Override

public CharSequence call() {

@@ -646,7 +646,7 @@ public class ContentViewCoreSelectionTest extends ContentShellTestBase {

private void waitForClipboardContents(final Context context, final String expectedContents)

throws InterruptedException {

- CriteriaHelper.pollForUIThreadCriteria(new Criteria() {

+ CriteriaHelper.pollUiThread(new Criteria() {

@Override

public boolean isSatisfied() {

ClipboardManager clipboardManager =

@@ -660,7 +660,7 @@ public class ContentViewCoreSelectionTest extends ContentShellTestBase {

private void waitForSelectActionBarVisible(

final boolean visible) throws InterruptedException {

- CriteriaHelper.pollForUIThreadCriteria(Criteria.equals(visible, new Callable<Boolean>() {

+ CriteriaHelper.pollUiThread(Criteria.equals(visible, new Callable<Boolean>() {

@Override

public Boolean call() {

return mContentViewCore.isSelectActionBarShowing();

@@ -715,7 +715,7 @@ public class ContentViewCoreSelectionTest extends ContentShellTestBase {

}

private void waitForPastePopupStatus(final boolean show) throws InterruptedException {

- CriteriaHelper.pollForUIThreadCriteria(Criteria.equals(show, new Callable<Boolean>() {

+ CriteriaHelper.pollUiThread(Criteria.equals(show, new Callable<Boolean>() {

@Override

public Boolean call() {

return mContentViewCore.isPastePopupShowing();