[NTP Snippets] Introduce ContentSuggestion::ID

components/ntp_snippets/bookmarks/bookmark_suggestions_provider.cc

Index: components/ntp_snippets/bookmarks/bookmark_suggestions_provider.cc
diff --git a/components/ntp_snippets/bookmarks/bookmark_suggestions_provider.cc b/components/ntp_snippets/bookmarks/bookmark_suggestions_provider.cc
index 27db53369de864abb9efdf91069fb6b30be533ea..ca953b53a5f443ff33d182c0bca24e3e4e06d61a 100644
--- a/components/ntp_snippets/bookmarks/bookmark_suggestions_provider.cc
+++ b/components/ntp_snippets/bookmarks/bookmark_suggestions_provider.cc
@@ -154,14 +154,14 @@ CategoryInfo BookmarkSuggestionsProvider::GetCategoryInfo(Category category) {
 }
 
 void BookmarkSuggestionsProvider::DismissSuggestion(
-    const std::string& suggestion_id) {
+    const ContentSuggestion::ID& suggestion_id) {
   DCHECK(bookmark_model_->loaded());
-  GURL url(GetWithinCategoryIDFromUniqueID(suggestion_id));
+  GURL url(suggestion_id.id_within_category());
   MarkBookmarksDismissed(bookmark_model_, url);
 }
 
 void BookmarkSuggestionsProvider::FetchSuggestionImage(
-    const std::string& suggestion_id,
+    const ContentSuggestion::ID& suggestion_id,
     const ImageFetchedCallback& callback) {
   base::ThreadTaskRunnerHandle::Get()->PostTask(
       FROM_HERE, base::Bind(callback, gfx::Image()));
@@ -260,9 +260,8 @@ void BookmarkSuggestionsProvider::BookmarkNodeRemoved(
 
 ContentSuggestion BookmarkSuggestionsProvider::ConvertBookmark(
     const BookmarkNode* bookmark) {
-  ContentSuggestion suggestion(
-      MakeUniqueID(provided_category_, bookmark->url().spec()),
-      bookmark->url());
+  ContentSuggestion suggestion(provided_category_, bookmark->url().spec(),
+                               bookmark->url());
 
   suggestion.set_title(bookmark->GetTitle());
   suggestion.set_snippet_text(base::string16());