Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(9)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/android/javatests/src/org/chromium/chrome/browser/BindingManagerIntegrationTest.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/BindingManagerInDocumentModeIntegrationTest.java ('k') | chrome/android/javatests/src/org/chromium/chrome/browser/BluetoothChooserDialogTest.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/android/javatests/src/org/chromium/chrome/browser/BindingManagerIntegrationTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/BindingManagerIntegrationTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/BindingManagerIntegrationTest.java
index 77f4d779c5a1a71569c319bf6711dfd9cf79b1c7..fab55c73412cc82a3887fffb8ea9a027af191a81 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/BindingManagerIntegrationTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/BindingManagerIntegrationTest.java
@@ -53,7 +53,7 @@ public class BindingManagerIntegrationTest extends ChromeActivityTestCaseBase<Ch
void assertIsInForeground(final int pid) {
try {
- CriteriaHelper.pollForCriteria(new Criteria() {
+ CriteriaHelper.pollInstrumentationThread(new Criteria() {
@Override
public boolean isSatisfied() {
return mProcessInForegroundMap.get(pid);
@@ -66,7 +66,7 @@ public class BindingManagerIntegrationTest extends ChromeActivityTestCaseBase<Ch
void assertIsInBackground(final int pid) {
try {
- CriteriaHelper.pollForCriteria(new Criteria() {
+ CriteriaHelper.pollInstrumentationThread(new Criteria() {
@Override
public boolean isSatisfied() {
return !mProcessInForegroundMap.get(pid);
@@ -79,7 +79,7 @@ public class BindingManagerIntegrationTest extends ChromeActivityTestCaseBase<Ch
void assertSetInForegroundWasCalled(String message, final int pid) {
try {
- CriteriaHelper.pollForCriteria(new Criteria(message) {
+ CriteriaHelper.pollInstrumentationThread(new Criteria(message) {
@Override
public boolean isSatisfied() {
return mProcessInForegroundMap.indexOfKey(pid) >= 0;
@@ -92,7 +92,7 @@ public class BindingManagerIntegrationTest extends ChromeActivityTestCaseBase<Ch
void assertIsReleaseAllModerateBindingsCalled() {
try {
- CriteriaHelper.pollForCriteria(new Criteria() {
+ CriteriaHelper.pollInstrumentationThread(new Criteria() {
@Override
public boolean isSatisfied() {
return mIsReleaseAllModerateBindingsCalled;
@@ -211,7 +211,7 @@ public class BindingManagerIntegrationTest extends ChromeActivityTestCaseBase<Ch
// Wait for the new tab animations on phones to finish.
if (!DeviceFormFactor.isTablet(getActivity())) {
final ChromeActivity activity = getActivity();
- CriteriaHelper.pollForUIThreadCriteria(new Criteria("Did not finish animation") {
+ CriteriaHelper.pollUiThread(new Criteria("Did not finish animation") {
@Override
public boolean isSatisfied() {
Layout layout = activity.getCompositorViewHolder()
@@ -282,7 +282,7 @@ public class BindingManagerIntegrationTest extends ChromeActivityTestCaseBase<Ch
// Wait for the new tab animations on phones to finish.
if (!DeviceFormFactor.isTablet(getActivity())) {
final ChromeActivity activity = getActivity();
- CriteriaHelper.pollForUIThreadCriteria(new Criteria("Did not finish animation") {
+ CriteriaHelper.pollUiThread(new Criteria("Did not finish animation") {
@Override
public boolean isSatisfied() {
Layout layout = activity.getCompositorViewHolder()
@@ -314,7 +314,7 @@ public class BindingManagerIntegrationTest extends ChromeActivityTestCaseBase<Ch
assertTrue(ChildProcessLauncher.crashProcessForTesting(
tabs[1].getContentViewCore().getCurrentRenderProcessId()));
- CriteriaHelper.pollForCriteria(
+ CriteriaHelper.pollInstrumentationThread(
new Criteria("Renderer crash wasn't noticed by the browser.") {
@Override
public boolean isSatisfied() {
@@ -331,7 +331,7 @@ public class BindingManagerIntegrationTest extends ChromeActivityTestCaseBase<Ch
});
// Wait until the process is spawned and its visibility is determined.
- CriteriaHelper.pollForCriteria(
+ CriteriaHelper.pollInstrumentationThread(
new Criteria("Process for the crashed tab was not respawned.") {
@Override
public boolean isSatisfied() {
@@ -380,7 +380,7 @@ public class BindingManagerIntegrationTest extends ChromeActivityTestCaseBase<Ch
assertTrue(ChildProcessLauncher.crashProcessForTesting(
tab.getContentViewCore().getCurrentRenderProcessId()));
- CriteriaHelper.pollForCriteria(
+ CriteriaHelper.pollInstrumentationThread(
new Criteria("Renderer crash wasn't noticed by the browser.") {
@Override
public boolean isSatisfied() {
@@ -397,7 +397,7 @@ public class BindingManagerIntegrationTest extends ChromeActivityTestCaseBase<Ch
});
// Wait until the process is spawned and its visibility is determined.
- CriteriaHelper.pollForCriteria(
+ CriteriaHelper.pollInstrumentationThread(
new Criteria("Process for the crashed tab was not respawned.") {
@Override
public boolean isSatisfied() {
@@ -563,7 +563,7 @@ public class BindingManagerIntegrationTest extends ChromeActivityTestCaseBase<Ch
tabs[0] = getActivity().getActivityTab();
singleClickView(tabs[0].getView());
- CriteriaHelper.pollForCriteria(new Criteria("Child tab isn't opened.") {
+ CriteriaHelper.pollInstrumentationThread(new Criteria("Child tab isn't opened.") {
@Override
public boolean isSatisfied() {
return getActivity().getCurrentTabModel().getCount() == 2
@@ -591,7 +591,7 @@ public class BindingManagerIntegrationTest extends ChromeActivityTestCaseBase<Ch
assertTrue(ChildProcessLauncher.crashProcessForTesting(
tabs[1].getContentViewCore().getCurrentRenderProcessId()));
- CriteriaHelper.pollForCriteria(
+ CriteriaHelper.pollInstrumentationThread(
new Criteria("Renderer crash wasn't noticed by the browser.") {
@Override
public boolean isSatisfied() {
@@ -607,7 +607,7 @@ public class BindingManagerIntegrationTest extends ChromeActivityTestCaseBase<Ch
});
// Wait until the process is spawned and its visibility is determined.
- CriteriaHelper.pollForCriteria(
+ CriteriaHelper.pollInstrumentationThread(
new Criteria("Process for the crashed tab was not respawned.") {
@Override
public boolean isSatisfied() {
« no previous file with comments | « chrome/android/javatests/src/org/chromium/chrome/browser/BindingManagerInDocumentModeIntegrationTest.java ('k') | chrome/android/javatests/src/org/chromium/chrome/browser/BluetoothChooserDialogTest.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698