chrome/android/javatests/src/org/chromium/chrome/browser/ModalDialogTest.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/ModalDialogTest.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/ItemChooserDialogTest.java ('k') | chrome/android/javatests/src/org/chromium/chrome/browser/NavigateTest.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/ModalDialogTest.java

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

index f3c03d9000f101e9625ceab972c5c5a4103ce13b..12a81ea0d20495cd325d19b6d6da4e20c5d3cee7 100644

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

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

@@ -280,7 +280,7 @@ public class ModalDialogTest extends ChromeActivityTestCaseBase<ChromeActivity>

});

// Closing the tab should have dismissed the dialog.

- CriteriaHelper.pollForCriteria(new JavascriptAppModalDialogShownCriteria(

+ CriteriaHelper.pollInstrumentationThread(new JavascriptAppModalDialogShownCriteria(

"The dialog should have been dismissed when its tab was closed.", false));

}

@@ -303,7 +303,7 @@ public class ModalDialogTest extends ChromeActivityTestCaseBase<ChromeActivity>

helper.evaluateJavaScriptForTests(

getActivity().getCurrentContentViewCore().getWebContents(),

script);

- CriteriaHelper.pollForCriteria(new JavascriptAppModalDialogShownCriteria(

+ CriteriaHelper.pollInstrumentationThread(new JavascriptAppModalDialogShownCriteria(

"Could not spawn or locate a modal dialog.", true));

return helper;

}