Add ContentSuggestionsService

components/ntp_snippets/ntp_snippet.cc

Index: components/ntp_snippets/ntp_snippet.cc
diff --git a/components/ntp_snippets/ntp_snippet.cc b/components/ntp_snippets/ntp_snippet.cc
index 640aea1e390994ec13896c5a6f6880368953bec5..b593659e94f0664f71326db5ae7befecae756b9b 100644
--- a/components/ntp_snippets/ntp_snippet.cc
+++ b/components/ntp_snippets/ntp_snippet.cc
@@ -9,8 +9,9 @@
 #include "base/strings/stringprintf.h"
 #include "base/values.h"
 #include "components/ntp_snippets/content_suggestion.h"
-#include "components/ntp_snippets/content_suggestion_category.h"
-#include "components/ntp_snippets/content_suggestions_provider_type.h"
+#include "components/ntp_snippets/content_suggestions_category.h"
+#include "components/ntp_snippets/content_suggestions_provider.h"
+
 #include "components/ntp_snippets/proto/ntp_snippets.pb.h"
 
 namespace {
@@ -247,9 +248,10 @@ SnippetProto NTPSnippet::ToProto() const {
 }
 
 std::unique_ptr<ContentSuggestion> NTPSnippet::ToContentSuggestion() const {
-  std::unique_ptr<ContentSuggestion> result(new ContentSuggestion(
-      id_, ContentSuggestionsProviderType::ARTICLES,
-      ContentSuggestionCategory::ARTICLE, best_source().url));
+  std::unique_ptr<ContentSuggestion> result(
+      new ContentSuggestion(ContentSuggestionsProvider::MakeUniqueID(
+                                ContentSuggestionsCategory::ARTICLES, id_),
+                            best_source().url));
   result->set_amp_url(best_source().amp_url);
   result->set_title(title_);
   result->set_snippet_text(snippet_);