| Index: chrome/android/javatests/src/org/chromium/chrome/browser/ntp/DocumentModeRecentlyClosedTest.java
|
| diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/ntp/DocumentModeRecentlyClosedTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/ntp/DocumentModeRecentlyClosedTest.java
|
| index c471f3e372ca471a861ad7b710bebce93481ce6a..0e98682aeef9a11f88515a4396c716eca005414c 100644
|
| --- a/chrome/android/javatests/src/org/chromium/chrome/browser/ntp/DocumentModeRecentlyClosedTest.java
|
| +++ b/chrome/android/javatests/src/org/chromium/chrome/browser/ntp/DocumentModeRecentlyClosedTest.java
|
| @@ -104,7 +104,7 @@ public class DocumentModeRecentlyClosedTest extends DocumentModeTestBase {
|
| // DocumentTabModel update.
|
| activityDelegate.mExtraRegularTask = null;
|
| ApplicationTestUtils.launchChrome(mContext);
|
| - CriteriaHelper.pollForCriteria(new Criteria() {
|
| + CriteriaHelper.pollInstrumentationThread(new Criteria() {
|
| @Override
|
| public boolean isSatisfied() {
|
| Activity lastActivity = ApplicationStatus.getLastTrackedFocusedActivity();
|
| @@ -113,7 +113,7 @@ public class DocumentModeRecentlyClosedTest extends DocumentModeTestBase {
|
| });
|
|
|
| // Wait until the DocumentTabModel updates and shows a single tab.
|
| - CriteriaHelper.pollForCriteria(Criteria.equals(1, new Callable<Integer>() {
|
| + CriteriaHelper.pollInstrumentationThread(Criteria.equals(1, new Callable<Integer>() {
|
| @Override
|
| public Integer call() {
|
| return selector.getTotalTabCount();
|
| @@ -163,7 +163,7 @@ public class DocumentModeRecentlyClosedTest extends DocumentModeTestBase {
|
| selector.getModel(false).closeTabAt(0);
|
| }
|
| });
|
| - CriteriaHelper.pollForUIThreadCriteria(Criteria.equals(2, new Callable<Integer>() {
|
| + CriteriaHelper.pollUiThread(Criteria.equals(2, new Callable<Integer>() {
|
| @Override
|
| public Integer call() {
|
| return selector.getTotalTabCount();
|
| @@ -237,7 +237,7 @@ public class DocumentModeRecentlyClosedTest extends DocumentModeTestBase {
|
| ActivityDelegate delegate =
|
| new ActivityDelegateImpl(DocumentActivity.class, IncognitoDocumentActivity.class);
|
| delegate.finishAndRemoveTask(false, tabIds[0]);
|
| - CriteriaHelper.pollForCriteria(Criteria.equals(2, new Callable<Integer>() {
|
| + CriteriaHelper.pollInstrumentationThread(Criteria.equals(2, new Callable<Integer>() {
|
| @Override
|
| public Integer call() {
|
| return selector.getTotalTabCount();
|
|
|