[NTP Snippets] Introduce ContentSuggestion::ID

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

Index: chrome/android/java/src/org/chromium/chrome/browser/ntp/snippets/SnippetsBridge.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/snippets/SnippetsBridge.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/snippets/SnippetsBridge.java
index e3850d185c08d8a66aceb9b790f52ebaf444d239..b5bd20d66c7cfbc856c84eca80d9bd7c19412240 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/snippets/SnippetsBridge.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/snippets/SnippetsBridge.java
@@ -107,13 +107,15 @@ public class SnippetsBridge implements SuggestionsSource {
     @Override
     public void fetchSuggestionImage(SnippetArticle suggestion, Callback<Bitmap> callback) {
         assert mNativeSnippetsBridge != 0;
-        nativeFetchSuggestionImage(mNativeSnippetsBridge, suggestion.mId, callback);
+        nativeFetchSuggestionImage(mNativeSnippetsBridge, suggestion.mCategory,
+                suggestion.mWithinCategoryId, callback);
     }
 
     @Override
     public void dismissSuggestion(SnippetArticle suggestion) {
         assert mNativeSnippetsBridge != 0;
-        nativeDismissSuggestion(mNativeSnippetsBridge, suggestion.mId);
+        nativeDismissSuggestion(
+                mNativeSnippetsBridge, suggestion.mCategory, suggestion.mWithinCategoryId);
     }
 
     @Override
@@ -219,8 +221,8 @@ public class SnippetsBridge implements SuggestionsSource {
     }
 
     @CalledByNative
-    private void onSuggestionInvalidated(@CategoryInt int category, String suggestionId) {
-        if (mObserver != null) mObserver.onSuggestionInvalidated(category, suggestionId);
+    private void onSuggestionInvalidated(@CategoryInt int category, String withinCategoryId) {
+        if (mObserver != null) mObserver.onSuggestionInvalidated(category, withinCategoryId);
     }
 
     private native long nativeInit(Profile profile);
@@ -233,9 +235,10 @@ public class SnippetsBridge implements SuggestionsSource {
             long nativeNTPSnippetsBridge, int category);
     private native List<SnippetArticle> nativeGetSuggestionsForCategory(
             long nativeNTPSnippetsBridge, int category);
-    private native void nativeFetchSuggestionImage(
-            long nativeNTPSnippetsBridge, String suggestionId, Callback<Bitmap> callback);
-    private native void nativeDismissSuggestion(long nativeNTPSnippetsBridge, String suggestionId);
+    private native void nativeFetchSuggestionImage(long nativeNTPSnippetsBridge, int category,
+            String withinCategoryId, Callback<Bitmap> callback);
+    private native void nativeDismissSuggestion(
+            long nativeNTPSnippetsBridge, int category, String withinCategoryId);
     private native void nativeDismissCategory(long nativeNTPSnippetsBridge, int category);
     private native void nativeGetURLVisited(
             long nativeNTPSnippetsBridge, Callback<Boolean> callback, String url);