Remove "list item" from Android NTP class names.

chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageView.java

Index: chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageView.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageView.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageView.java
index 7e5105922a3138fd5a9d80f3185c13e2a705612d..f1a5d0da1d97019189bc31b7149a1eedbf8fdfdf 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageView.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageView.java
@@ -46,7 +46,7 @@ import org.chromium.chrome.browser.ntp.LogoBridge.LogoObserver;
 import org.chromium.chrome.browser.ntp.MostVisitedItem.MostVisitedItemManager;
 import org.chromium.chrome.browser.ntp.NewTabPage.OnSearchBoxScrollListener;
 import org.chromium.chrome.browser.ntp.cards.NewTabPageAdapter;
-import org.chromium.chrome.browser.ntp.cards.NewTabPageListItem;
+import org.chromium.chrome.browser.ntp.cards.NewTabPageItem;
 import org.chromium.chrome.browser.ntp.cards.NewTabPageRecyclerView;
 import org.chromium.chrome.browser.ntp.snippets.SnippetsBridge;
 import org.chromium.chrome.browser.profiles.MostVisitedSites.MostVisitedURLsObserver;
@@ -460,14 +460,13 @@ public class NewTabPageView extends FrameLayout
 
     /**
      * Get the number of listed items (visible or not) for the given type.
-     * @param newTabPageListItemViewType the item type to count.
+     * @param newTabPageItemViewType the item type to count.
      */
-    public int getViewCountMatchingViewType(
-            @NewTabPageListItem.ViewType int newTabPageListItemViewType) {
+    public int getViewCountMatchingViewType(@NewTabPageItem.ViewType int newTabPageItemViewType) {
         int viewCount = 0;
         int adapterSize = mNewTabPageAdapter.getItemCount();
         for (int i = 0; i < adapterSize; i++) {
-            if (mNewTabPageAdapter.getItemViewType(i) == newTabPageListItemViewType) {
+            if (mNewTabPageAdapter.getItemViewType(i) == newTabPageItemViewType) {
                 viewCount++;
             }
         }