Unify NewTabPageItem and ItemGroup into a single tree-structured interface.

chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/SpacingItem.java

Index: chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/SpacingItem.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/SpacingItem.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/SpacingItem.java
index 00bf7a30636a0db6785658f3acf4aaef9a2e3914..0ddafadd1db64232eb54e3b6d33d80a7a0a8b7e9 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/SpacingItem.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/SpacingItem.java
@@ -13,7 +13,7 @@ import android.view.ViewGroup;
  * contain enough of them. It is displayed as a dummy item with variable height that just occupies
  * the remaining space between the last item in the RecyclerView and the bottom of the screen.
  */
-public class SpacingItem extends SingleItemGroup {
+public class SpacingItem extends Leaf {
     private static class SpacingView extends View {
         public SpacingView(Context context) {
             super(context);
@@ -32,12 +32,13 @@ public class SpacingItem extends SingleItemGroup {
     }
 
     @Override
-    public int getType() {
-        return NewTabPageItem.VIEW_TYPE_SPACING;
+    @ItemViewType
+    protected int getItemViewType() {
+        return ItemViewType.VIEW_TYPE_SPACING;
     }
 
     @Override
-    public void onBindViewHolder(NewTabPageViewHolder holder) {
+    protected void onBindViewHolder(NewTabPageViewHolder holder) {
         // Nothing to do.
     }
 }