[NTP Snippets] Introduce ContentSuggestion::ID

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

Index: chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/NewTabPageAdapter.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/NewTabPageAdapter.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/NewTabPageAdapter.java
index 886dd20d85d56b8cacb93fa8c6c2113e53588d80..253b2668bb1e16cc8cde7cbeb77bb3f9abaa3080 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/NewTabPageAdapter.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/NewTabPageAdapter.java
@@ -230,9 +230,9 @@ public class NewTabPageAdapter extends Adapter<NewTabPageViewHolder>
     }
 
     @Override
-    public void onSuggestionInvalidated(@CategoryInt int category, String suggestionId) {
+    public void onSuggestionInvalidated(@CategoryInt int category, String withinCategoryId) {
         if (!mSections.containsKey(category)) return;
-        mSections.get(category).removeSuggestionById(suggestionId);
+        mSections.get(category).removeSuggestionById(withinCategoryId);
         updateGroups();
     }
 
@@ -318,14 +318,11 @@ public class NewTabPageAdapter extends Adapter<NewTabPageViewHolder>
         return getGroupPositionOffset(mBottomSpacer);
     }
 
-    public int getSuggestionPosition(String suggestionId) {
+    public int getSuggestionPosition(SnippetArticle article) {
         List<NewTabPageItem> items = getItems();
         for (int i = 0; i < items.size(); i++) {
             NewTabPageItem item = items.get(i);
-            if (item instanceof SnippetArticle
-                    && ((SnippetArticle) item).mId.equals(suggestionId)) {
-                return i;
-            }
+            if (article.equals(item)) return i;
         }
         return RecyclerView.NO_POSITION;
     }