| Index: chrome/android/javatests/src/org/chromium/chrome/browser/download/DownloadManagerServiceTest.java
|
| diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/download/DownloadManagerServiceTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/download/DownloadManagerServiceTest.java
|
| index a472ab2e87a09edbdb6246206fa0d79bfb3e5f84..fe59aa202563d0e159de0a89c766bca4e1745358 100644
|
| --- a/chrome/android/javatests/src/org/chromium/chrome/browser/download/DownloadManagerServiceTest.java
|
| +++ b/chrome/android/javatests/src/org/chromium/chrome/browser/download/DownloadManagerServiceTest.java
|
| @@ -76,7 +76,7 @@ public class DownloadManagerServiceTest extends InstrumentationTestCase {
|
|
|
| public void waitTillExpectedCallsComplete() {
|
| try {
|
| - CriteriaHelper.pollForCriteria(
|
| + CriteriaHelper.pollInstrumentationThread(
|
| new Criteria("Failed while waiting for all calls to complete.") {
|
| @Override
|
| public boolean isSatisfied() {
|
| @@ -147,7 +147,7 @@ public class DownloadManagerServiceTest extends InstrumentationTestCase {
|
|
|
| public void waitForSnackbarControllerToFinish(final boolean success) {
|
| try {
|
| - CriteriaHelper.pollForCriteria(
|
| + CriteriaHelper.pollInstrumentationThread(
|
| new Criteria("Failed while waiting for all calls to complete.") {
|
| @Override
|
| public boolean isSatisfied() {
|
| @@ -448,7 +448,7 @@ public class DownloadManagerServiceTest extends InstrumentationTestCase {
|
| dService.setOMADownloadHandler(handler);
|
| dService.addOMADownloadToSharedPrefs(String.valueOf(downloadId) + "," + INSTALL_NOTIFY_URI);
|
| dService.clearPendingOMADownloads();
|
| - CriteriaHelper.pollForUIThreadCriteria(new Criteria() {
|
| + CriteriaHelper.pollUiThread(new Criteria() {
|
| @Override
|
| public boolean isSatisfied() {
|
| return handler.mSuccess;
|
| @@ -484,7 +484,7 @@ public class DownloadManagerServiceTest extends InstrumentationTestCase {
|
| dService.setOMADownloadHandler(handler);
|
| handler.setDownloadId(0);
|
| dService.enqueueDownloadManagerRequest(info, true);
|
| - CriteriaHelper.pollForUIThreadCriteria(new Criteria() {
|
| + CriteriaHelper.pollUiThread(new Criteria() {
|
| @Override
|
| public boolean isSatisfied() {
|
| return handler.mDownloadId != 0;
|
|
|