[Android Download] Show a progress bar before backend is loaded

chrome/android/javatests/src/org/chromium/chrome/browser/download/ui/DownloadHistoryAdapterTest.java

Index: chrome/android/javatests/src/org/chromium/chrome/browser/download/ui/DownloadHistoryAdapterTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/download/ui/DownloadHistoryAdapterTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/download/ui/DownloadHistoryAdapterTest.java
index 9f6723678d1277d37f10de1cab07543e00f4b7b4..7f3b06cd8237c6787871bcb3162e72764cdb57ca 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/download/ui/DownloadHistoryAdapterTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/download/ui/DownloadHistoryAdapterTest.java
@@ -62,7 +62,7 @@ public class DownloadHistoryAdapterTest extends NativeLibraryTestBase {
             }
         });
         mDownloadDelegate.addCallback.waitForCallback(0);
-        mObserver.onChangedCallback.waitForCallback(callCount, showOffTheRecord ? 3 : 2);
+        mObserver.onChangedCallback.waitForCallback(callCount, 1);
     }
 
     /** Nothing downloaded, nothing shown. */
@@ -156,49 +156,49 @@ public class DownloadHistoryAdapterTest extends NativeLibraryTestBase {
         assertEquals(0, mAdapter.getTotalDownloadSize());
 
         // Add the first item.
-        assertEquals(2, mObserver.onChangedCallback.getCallCount());
+        assertEquals(1, mObserver.onChangedCallback.getCallCount());
         DownloadItem item0 = StubbedProvider.createDownloadItem(0, "19840116 12:00");
         mAdapter.onDownloadItemUpdated(item0, false);
-        mObserver.onChangedCallback.waitForCallback(2);
+        mObserver.onChangedCallback.waitForCallback(1);
         checkAdapterContents(null, item0);
         assertEquals(1, mAdapter.getTotalDownloadSize());
 
         // Add a second item with a different date.
-        assertEquals(3, mObserver.onChangedCallback.getCallCount());
+        assertEquals(2, mObserver.onChangedCallback.getCallCount());
         DownloadItem item1 = StubbedProvider.createDownloadItem(1, "19840117 12:00");
         mAdapter.onDownloadItemUpdated(item1, false);
-        mObserver.onChangedCallback.waitForCallback(3);
+        mObserver.onChangedCallback.waitForCallback(2);
         checkAdapterContents(null, item1, null, item0);
         assertEquals(11, mAdapter.getTotalDownloadSize());
 
         // Add a third item with the same date as the second item.
-        assertEquals(4, mObserver.onChangedCallback.getCallCount());
+        assertEquals(3, mObserver.onChangedCallback.getCallCount());
         DownloadItem item2 = StubbedProvider.createDownloadItem(2, "19840117 18:00");
         mAdapter.onDownloadItemUpdated(item2, false);
-        mObserver.onChangedCallback.waitForCallback(4);
+        mObserver.onChangedCallback.waitForCallback(3);
         checkAdapterContents(null, item2, item1, null, item0);
         assertEquals(111, mAdapter.getTotalDownloadSize());
 
         // An item with the same download ID as the second item should just update the old one.
-        assertEquals(5, mObserver.onChangedCallback.getCallCount());
+        assertEquals(4, mObserver.onChangedCallback.getCallCount());
         DownloadItem item3 = StubbedProvider.createDownloadItem(2, "19840117 18:00");
         mAdapter.onDownloadItemUpdated(item3, false);
-        mObserver.onChangedCallback.waitForCallback(5);
+        mObserver.onChangedCallback.waitForCallback(4);
         checkAdapterContents(null, item3, item1, null, item0);
         assertEquals(111, mAdapter.getTotalDownloadSize());
 
         // Throw on a new OfflinePageItem.
-        assertEquals(6, mObserver.onChangedCallback.getCallCount());
+        assertEquals(5, mObserver.onChangedCallback.getCallCount());
         OfflinePageDownloadItem item4 = StubbedProvider.createOfflineItem(0, "19840117 19:00");
         mOfflineDelegate.observer.onItemAdded(item4);
-        mObserver.onChangedCallback.waitForCallback(6);
+        mObserver.onChangedCallback.waitForCallback(5);
         checkAdapterContents(null, item4, item3, item1, null, item0);
 
         // Update the existing OfflinePageItem.
-        assertEquals(7, mObserver.onChangedCallback.getCallCount());
+        assertEquals(6, mObserver.onChangedCallback.getCallCount());
         OfflinePageDownloadItem item5 = StubbedProvider.createOfflineItem(0, "19840117 19:00");
         mOfflineDelegate.observer.onItemUpdated(item5);
-        mObserver.onChangedCallback.waitForCallback(7);
+        mObserver.onChangedCallback.waitForCallback(6);
         checkAdapterContents(null, item5, item3, item1, null, item0);
     }
 
@@ -218,23 +218,23 @@ public class DownloadHistoryAdapterTest extends NativeLibraryTestBase {
         assertEquals(100011, mAdapter.getTotalDownloadSize());
 
         // Remove an item from the date bucket with two items.
-        assertEquals(3, mObserver.onChangedCallback.getCallCount());
+        assertEquals(1, mObserver.onChangedCallback.getCallCount());
         mAdapter.onDownloadItemRemoved(offTheRecordItem.getId(), true);
-        mObserver.onChangedCallback.waitForCallback(3);
+        mObserver.onChangedCallback.waitForCallback(1);
         checkAdapterContents(null, offlineItem, null, regularItem);
         assertEquals(100001, mAdapter.getTotalDownloadSize());
 
         // Remove an item from the second bucket, which removes the bucket entirely.
-        assertEquals(4, mObserver.onChangedCallback.getCallCount());
+        assertEquals(2, mObserver.onChangedCallback.getCallCount());
         mOfflineDelegate.observer.onItemDeleted(offlineItem.getGuid());
-        mObserver.onChangedCallback.waitForCallback(4);
+        mObserver.onChangedCallback.waitForCallback(2);
         checkAdapterContents(null, regularItem);
         assertEquals(1, mAdapter.getTotalDownloadSize());
 
         // Remove the last item in the list.
-        assertEquals(5, mObserver.onChangedCallback.getCallCount());
+        assertEquals(3, mObserver.onChangedCallback.getCallCount());
         mAdapter.onDownloadItemRemoved(regularItem.getId(), false);
-        mObserver.onChangedCallback.waitForCallback(5);
+        mObserver.onChangedCallback.waitForCallback(3);
         assertEquals(0, mAdapter.getItemCount());
         assertEquals(0, mAdapter.getTotalDownloadSize());
     }