chrome/android/javatests/src/org/chromium/chrome/browser/firstrun/FirstRunIntegrationTest.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/firstrun/FirstRunIntegrationTest.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/feedback/ConnectivityTaskTest.java ('k') | chrome/android/javatests/src/org/chromium/chrome/browser/fullscreen/FullscreenManagerTest.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/firstrun/FirstRunIntegrationTest.java

diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/firstrun/FirstRunIntegrationTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/firstrun/FirstRunIntegrationTest.java

index 57b84382f7ad042b5438caae90f4e389cb2ddcfb..4723d930b252fb13a77a0d26ac2ebef51c818a66 100644

--- a/chrome/android/javatests/src/org/chromium/chrome/browser/firstrun/FirstRunIntegrationTest.java

+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/firstrun/FirstRunIntegrationTest.java

@@ -34,7 +34,7 @@ public class FirstRunIntegrationTest extends ChromeTabbedActivityTestBase {

sendKeys(KeyEvent.KEYCODE_BACK);

- CriteriaHelper.pollForCriteria(new Criteria("Expected no tabs to be present") {

+ CriteriaHelper.pollInstrumentationThread(new Criteria("Expected no tabs to be present") {

@Override

public boolean isSatisfied() {

return 0 == getActivity().getCurrentTabModel().getCount();

@@ -43,7 +43,7 @@ public class FirstRunIntegrationTest extends ChromeTabbedActivityTestBase {

TabList fullModel = getActivity().getCurrentTabModel().getComprehensiveModel();

assertEquals("Expected no tabs to be present in the comprehensive model",

0, fullModel.getCount());

- CriteriaHelper.pollForCriteria(new Criteria("Activity was not closed.") {

+ CriteriaHelper.pollInstrumentationThread(new Criteria("Activity was not closed.") {

@Override

public boolean isSatisfied() {

return getActivity().isFinishing() || getActivity().isDestroyed();