[Download Home] Use fewer AsyncTasks

chrome/android/javatests/src/org/chromium/chrome/browser/download/DownloadActivityTest.java

Index: chrome/android/javatests/src/org/chromium/chrome/browser/download/DownloadActivityTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/download/DownloadActivityTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/download/DownloadActivityTest.java
index 3ef355adfd004840ee96b9d40c5c385da3c1dac6..e4b69bd7636bb5d8f98af95ca5d1281245a454a4 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/download/DownloadActivityTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/download/DownloadActivityTest.java
@@ -290,9 +290,10 @@ public class DownloadActivityTest extends BaseActivityInstrumentationTestCase<Do
                 mAdapter.onDownloadItemCreated(item8);
             }
         });
-        mAdapterObserver.onSpaceDisplayUpdatedCallback.waitForCallback(callCount, 2);
 
-        // This first check is a Criteria because initialization of the Adapter is asynchronous.
+        // The criteria is needed because an AsyncTask is fired to update the space display, which
+        // can result in either 1 or 2 updates.
+        mAdapterObserver.onSpaceDisplayUpdatedCallback.waitForCallback(callCount);
         CriteriaHelper.pollUiThread(new Criteria() {
             @Override
             public boolean isSatisfied() {
@@ -367,9 +368,10 @@ public class DownloadActivityTest extends BaseActivityInstrumentationTestCase<Do
                 mAdapter.onDownloadItemCreated(item8);
             }
         });
-        mAdapterObserver.onSpaceDisplayUpdatedCallback.waitForCallback(callCount, 2);
 
-        // This first check is a Criteria because initialization of the Adapter is asynchronous.
+        // The criteria is needed because an AsyncTask is fired to update the space display, which
+        // can result in either 1 or 2 updates.
+        mAdapterObserver.onSpaceDisplayUpdatedCallback.waitForCallback(callCount);
         CriteriaHelper.pollUiThread(new Criteria() {
             @Override
             public boolean isSatisfied() {