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

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

Index: chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/CardViewHolder.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/CardViewHolder.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/CardViewHolder.java
index f5d553ee12475391acf8b99871ac5c96f0ff3bd2..532e5f16eb4cb701037cf1119f3ed8fd9755db61 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/CardViewHolder.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/CardViewHolder.java
@@ -233,19 +233,19 @@ public class CardViewHolder extends NewTabPageViewHolder {
         return LayoutInflater.from(parent.getContext()).inflate(resourceId, parent, false);
     }
 
-    public static boolean isCard(@NewTabPageItem.ViewType int type) {
+    public static boolean isCard(@ItemViewType int type) {
         switch (type) {
-            case NewTabPageItem.VIEW_TYPE_SNIPPET:
-            case NewTabPageItem.VIEW_TYPE_STATUS:
-            case NewTabPageItem.VIEW_TYPE_ACTION:
-            case NewTabPageItem.VIEW_TYPE_PROMO:
+            case ItemViewType.VIEW_TYPE_SNIPPET:
+            case ItemViewType.VIEW_TYPE_STATUS:
+            case ItemViewType.VIEW_TYPE_ACTION:
+            case ItemViewType.VIEW_TYPE_PROMO:
                 return true;
-            case NewTabPageItem.VIEW_TYPE_ABOVE_THE_FOLD:
-            case NewTabPageItem.VIEW_TYPE_HEADER:
-            case NewTabPageItem.VIEW_TYPE_SPACING:
-            case NewTabPageItem.VIEW_TYPE_PROGRESS:
-            case NewTabPageItem.VIEW_TYPE_FOOTER:
-            case NewTabPageItem.VIEW_TYPE_ALL_DISMISSED:
+            case ItemViewType.VIEW_TYPE_ABOVE_THE_FOLD:
+            case ItemViewType.VIEW_TYPE_HEADER:
+            case ItemViewType.VIEW_TYPE_SPACING:
+            case ItemViewType.VIEW_TYPE_PROGRESS:
+            case ItemViewType.VIEW_TYPE_FOOTER:
+            case ItemViewType.VIEW_TYPE_ALL_DISMISSED:
                 return false;
             default:
                 assert false;