[NTP Snippets] Fill space below the last snippet if necessary

chrome/android/junit/src/org/chromium/chrome/browser/ntp/cards/NewTabPageAdapterTest.java

Index: chrome/android/junit/src/org/chromium/chrome/browser/ntp/cards/NewTabPageAdapterTest.java
diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/ntp/cards/NewTabPageAdapterTest.java b/chrome/android/junit/src/org/chromium/chrome/browser/ntp/cards/NewTabPageAdapterTest.java
index 0600e19f02b8b4486019b92d79a33bf7a17939b6..b0beb223bb1cc078400ab92ce655e5d737f49f5f 100644
--- a/chrome/android/junit/src/org/chromium/chrome/browser/ntp/cards/NewTabPageAdapterTest.java
+++ b/chrome/android/junit/src/org/chromium/chrome/browser/ntp/cards/NewTabPageAdapterTest.java
@@ -75,7 +75,9 @@ public void testSnippetLoading() {
         List<NewTabPageListItem> loadedItems = ntpa.getItemsForTesting();
         assertEquals(NewTabPageListItem.VIEW_TYPE_ABOVE_THE_FOLD, ntpa.getItemViewType(0));
         assertEquals(NewTabPageListItem.VIEW_TYPE_HEADER, ntpa.getItemViewType(1));
-        assertEquals(snippets, loadedItems.subList(2, loadedItems.size()));
+        assertEquals(snippets, loadedItems.subList(2, loadedItems.size() - 1));
+        assertEquals(
+                NewTabPageListItem.VIEW_TYPE_SPACING, ntpa.getItemViewType(loadedItems.size() - 1));
         assertNull(mSnippetsObserver);
     }
 
@@ -88,7 +90,8 @@ public void testSnippetLoading() {
     public void testSnippetLoadingInitiallyEmpty() {
         NewTabPageAdapter ntpa = new NewTabPageAdapter(mNewTabPageManager, null);
 
-        // If we don't get anything, we should still have the above-the-fold item present.
+        // If we don't get anything, we should still have the above-the-fold item and the spacing
+        // present.
         mSnippetsObserver.onSnippetsReceived(new ArrayList<SnippetArticle>());
         assertEquals(1, ntpa.getItemCount());
         assertEquals(NewTabPageListItem.VIEW_TYPE_ABOVE_THE_FOLD, ntpa.getItemViewType(0));
@@ -104,7 +107,9 @@ public void testSnippetLoadingInitiallyEmpty() {
         List<NewTabPageListItem> loadedItems = ntpa.getItemsForTesting();
         assertEquals(NewTabPageListItem.VIEW_TYPE_ABOVE_THE_FOLD, ntpa.getItemViewType(0));
         assertEquals(NewTabPageListItem.VIEW_TYPE_HEADER, ntpa.getItemViewType(1));
-        assertEquals(snippets, loadedItems.subList(2, loadedItems.size()));
+        assertEquals(snippets, loadedItems.subList(2, loadedItems.size() - 1));
+        assertEquals(
+                NewTabPageListItem.VIEW_TYPE_SPACING, ntpa.getItemViewType(loadedItems.size() - 1));
         assertNull(mSnippetsObserver);
     }
 }