| Index: content/public/android/javatests/src/org/chromium/content/common/CleanupReferenceTest.java
|
| diff --git a/content/public/android/javatests/src/org/chromium/content/common/CleanupReferenceTest.java b/content/public/android/javatests/src/org/chromium/content/common/CleanupReferenceTest.java
|
| index a093583c8ff51043a2b44407ad6160988b5586e5..1c302138fe283995c324b6e689f0b45596d30143 100644
|
| --- a/content/public/android/javatests/src/org/chromium/content/common/CleanupReferenceTest.java
|
| +++ b/content/public/android/javatests/src/org/chromium/content/common/CleanupReferenceTest.java
|
| @@ -67,7 +67,7 @@ public class CleanupReferenceTest extends InstrumentationTestCase {
|
| // Ensure compiler / instrumentation does not strip out the assignment.
|
| assertTrue(instance == null);
|
| collectGarbage();
|
| - CriteriaHelper.pollForCriteria(Criteria.equals(0, new Callable<Integer>() {
|
| + CriteriaHelper.pollInstrumentationThread(Criteria.equals(0, new Callable<Integer>() {
|
| @Override
|
| public Integer call() {
|
| return sObjectCount.get();
|
| @@ -96,7 +96,7 @@ public class CleanupReferenceTest extends InstrumentationTestCase {
|
| // to be GC'ed only when building using GN.
|
| assertTrue(sObjectCount.get() != -1);
|
| collectGarbage();
|
| - CriteriaHelper.pollForCriteria(Criteria.equals(0, new Callable<Integer>() {
|
| + CriteriaHelper.pollInstrumentationThread(Criteria.equals(0, new Callable<Integer>() {
|
| @Override
|
| public Integer call() {
|
| return sObjectCount.get();
|
|
|