Remove "list item" from Android NTP class names.

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

Index: chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/SuggestionsSection.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/SuggestionsSection.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/SuggestionsSection.java
index edd97047d4c9470b32f2f29600d2ee0daeb9b40c..6fea61f11cbd63d33edad7f9d79920ffaf99f54d 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/SuggestionsSection.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/SuggestionsSection.java
@@ -7,8 +7,8 @@ package org.chromium.chrome.browser.ntp.cards;
 import org.chromium.chrome.browser.ChromeFeatureList;
 import org.chromium.chrome.browser.ntp.snippets.CategoryStatus.CategoryStatusEnum;
 import org.chromium.chrome.browser.ntp.snippets.KnownCategories;
-import org.chromium.chrome.browser.ntp.snippets.SnippetArticleListItem;
-import org.chromium.chrome.browser.ntp.snippets.SnippetHeaderListItem;
+import org.chromium.chrome.browser.ntp.snippets.SectionHeader;
+import org.chromium.chrome.browser.ntp.snippets.SnippetArticle;
 import org.chromium.chrome.browser.ntp.snippets.SnippetsBridge;
 
 import java.util.ArrayList;
@@ -19,17 +19,17 @@ import java.util.List;
  * A group of suggestions, with a header, a status card, and a progress indicator.
  */
 public class SuggestionsSection implements ItemGroup {
-    private final List<SnippetArticleListItem> mSuggestions = new ArrayList<>();
-    private final SnippetHeaderListItem mHeader;
-    private StatusListItem mStatus;
-    private final ProgressListItem mProgressIndicator = new ProgressListItem();
-    private final ActionListItem mMoreButton;
+    private final List<SnippetArticle> mSuggestions = new ArrayList<>();
+    private final SectionHeader mHeader;
+    private StatusItem mStatus;
+    private final ProgressItem mProgressIndicator = new ProgressItem();
+    private final ActionItem mMoreButton;
 
-    public SuggestionsSection(int category, List<SnippetArticleListItem> suggestions,
+    public SuggestionsSection(int category, List<SnippetArticle> suggestions,
             @CategoryStatusEnum int status, SuggestionsCategoryInfo info,
             NewTabPageAdapter adapter) {
 
-        mHeader = new SnippetHeaderListItem(info.getTitle());
+        mHeader = new SectionHeader(info.getTitle());
         // TODO(pke): Replace the condition with "info.hasMoreButton()" once all other categories
         // are supported by the C++ backend, too.
         // Right now, we hard-code all the sections that are handled in ActionListItem.
@@ -39,13 +39,13 @@ public class SuggestionsSection implements ItemGroup {
         } else if (category == KnownCategories.DOWNLOADS) {
             showMoreButton = ChromeFeatureList.isEnabled("DownloadsUi");
         }
-        mMoreButton = showMoreButton ? new ActionListItem(category) : null;
+        mMoreButton = showMoreButton ? new ActionItem(category) : null;
         setSuggestions(suggestions, status, adapter);
     }
 
     @Override
-    public List<NewTabPageListItem> getItems() {
-        List<NewTabPageListItem> items = new ArrayList<>();
+    public List<NewTabPageItem> getItems() {
+        List<NewTabPageItem> items = new ArrayList<>();
         items.add(mHeader);
         items.addAll(mSuggestions);
         if (mSuggestions.isEmpty()) {
@@ -57,7 +57,7 @@ public class SuggestionsSection implements ItemGroup {
         return Collections.unmodifiableList(items);
     }
 
-    public void dismissSuggestion(SnippetArticleListItem suggestion) {
+    public void dismissSuggestion(SnippetArticle suggestion) {
         mSuggestions.remove(suggestion);
     }
 
@@ -65,19 +65,19 @@ public class SuggestionsSection implements ItemGroup {
         return !mSuggestions.isEmpty();
     }
 
-    public void setSuggestions(List<SnippetArticleListItem> suggestions,
+    public void setSuggestions(List<SnippetArticle> suggestions,
             @CategoryStatusEnum int status, NewTabPageAdapter adapter) {
         copyThumbnails(suggestions);
 
-        mStatus = StatusListItem.create(status, adapter);
+        mStatus = StatusItem.create(status, adapter);
         mProgressIndicator.setVisible(SnippetsBridge.isCategoryLoading(status));
 
         mSuggestions.clear();
         mSuggestions.addAll(suggestions);
     }
 
-    private void copyThumbnails(List<SnippetArticleListItem> suggestions) {
-        for (SnippetArticleListItem suggestion : suggestions) {
+    private void copyThumbnails(List<SnippetArticle> suggestions) {
+        for (SnippetArticle suggestion : suggestions) {
             int index = mSuggestions.indexOf(suggestion);
             if (index == -1) continue;