Download Home : Remove drawer UI

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 69a91cef07d4e8c024ab2bf85a29101a9361a1e7..6e5f09f36559a62266da736a88c261a8d9d56be6 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
@@ -545,17 +545,23 @@ public class DownloadHistoryAdapterTest {
 
     /** Checks that the adapter has the correct items in the right places. */
     private void checkAdapterContents(Object... expectedItems) {
-        Assert.assertEquals(expectedItems.length, mAdapter.getItemCount());
+        if (expectedItems.length == 0) {
+            Assert.assertEquals(0, mAdapter.getItemCount());
+            return;
+        }
+
+        // Leave the first element of the adapter which is the space usage header.
+        Assert.assertEquals(expectedItems.length + 1, mAdapter.getItemCount());
         for (int i = 0; i < expectedItems.length; i++) {
             if (expectedItems[i] == null) {
                 // Expect a date.
                 // TODO(dfalcantara): Check what date the header is showing.
-                Assert.assertEquals(TYPE_DATE, mAdapter.getItemViewType(i));
+                Assert.assertEquals(TYPE_DATE, mAdapter.getItemViewType(i + 1));
             } else {
                 // Expect a particular item.
-                Assert.assertEquals(TYPE_NORMAL, mAdapter.getItemViewType(i));
+                Assert.assertEquals(TYPE_NORMAL, mAdapter.getItemViewType(i + 1));
                 Assert.assertEquals(expectedItems[i],
-                        ((DownloadHistoryItemWrapper) mAdapter.getItemAt(i).second).getItem());
+                        ((DownloadHistoryItemWrapper) mAdapter.getItemAt(i + 1).second).getItem());
             }
         }
     }