[NTP Snippets] Introduce ContentSuggestion::ID

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

Index: chrome/android/java/src/org/chromium/chrome/browser/ntp/snippets/FakeSuggestionsSource.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/snippets/FakeSuggestionsSource.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/snippets/FakeSuggestionsSource.java
index bec2652b065b0993dea893b73096500dc69b9e03..a48eff241eed798f8ff6922ba53beb67c8ed6f23 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/snippets/FakeSuggestionsSource.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/snippets/FakeSuggestionsSource.java
@@ -70,14 +70,14 @@ public class FakeSuggestionsSource implements SuggestionsSource {
      * Removes the given suggestion from the source and notifies any observer that it has been
      * invalidated.
      */
-    public void fireSuggestionInvalidated(@CategoryInt int category, String suggestionId) {
+    public void fireSuggestionInvalidated(@CategoryInt int category, String withinCategoryId) {
         for (SnippetArticle suggestion : mSuggestions.get(category)) {
-            if (suggestion.mId.equals(suggestionId)) {
+            if (suggestion.mWithinCategoryId.equals(withinCategoryId)) {
                 mSuggestions.get(category).remove(suggestion);
                 break;
             }
         }
-        mObserver.onSuggestionInvalidated(category, suggestionId);
+        mObserver.onSuggestionInvalidated(category, withinCategoryId);
     }
 
     /**
@@ -102,8 +102,8 @@ public class FakeSuggestionsSource implements SuggestionsSource {
 
     @Override
     public void fetchSuggestionImage(SnippetArticle suggestion, Callback<Bitmap> callback) {
-        if (mThumbnails.containsKey(suggestion.mId)) {
-            callback.onResult(mThumbnails.get(suggestion.mId));
+        if (mThumbnails.containsKey(suggestion.mWithinCategoryId)) {
+            callback.onResult(mThumbnails.get(suggestion.mWithinCategoryId));
         }
     }