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

chrome/android/java/src/org/chromium/chrome/browser/ntp/snippets/SnippetArticle.java

Index: chrome/android/java/src/org/chromium/chrome/browser/ntp/snippets/SnippetArticle.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/snippets/SnippetArticle.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/snippets/SnippetArticle.java
index c47c40cd80e8cce10be2eda5398a9423e5d68cfb..0ee380596d32e33e20baa2345114a861af08ddb4 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/snippets/SnippetArticle.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/snippets/SnippetArticle.java
@@ -5,14 +5,15 @@ package org.chromium.chrome.browser.ntp.snippets;
 
 import android.graphics.Bitmap;
 
-import org.chromium.chrome.browser.ntp.cards.NewTabPageItem;
+import org.chromium.chrome.browser.ntp.cards.ItemViewType;
+import org.chromium.chrome.browser.ntp.cards.Leaf;
 import org.chromium.chrome.browser.ntp.cards.NewTabPageViewHolder;
 import org.chromium.chrome.browser.ntp.snippets.ContentSuggestionsCardLayout.ContentSuggestionsCardLayoutEnum;
 
 /**
  * Represents the data for an article card on the NTP.
  */
-public class SnippetArticle implements NewTabPageItem {
+public class SnippetArticle extends Leaf {
     /** The category of this article. */
     public final int mCategory;
 
@@ -88,12 +89,13 @@ public class SnippetArticle implements NewTabPageItem {
     }
 
     @Override
-    public int getType() {
-        return NewTabPageItem.VIEW_TYPE_SNIPPET;
+    @ItemViewType
+    public int getItemViewType() {
+        return ItemViewType.VIEW_TYPE_SNIPPET;
     }
 
     @Override
-    public void onBindViewHolder(NewTabPageViewHolder holder) {
+    protected void onBindViewHolder(NewTabPageViewHolder holder) {
         assert holder instanceof SnippetArticleViewHolder;
         ((SnippetArticleViewHolder) holder).onBindViewHolder(this);
     }