Add ContentSuggestionsService

components/ntp_snippets/ntp_snippet.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/ntp_snippets/ntp_snippet.h"
 
 #include "base/memory/ptr_util.h"
 #include "base/strings/string_number_conversions.h"
 #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 {
 
 // dict.Get() specialization for base::Time values
 bool GetTimeValue(const base::DictionaryValue& dict,
                   const std::string& key,
                   base::Time* time) {
   std::string time_value;
   return dict.GetString(key, &time_value) &&
@@ skipping 216 matching lines @@
     if (!source.publisher_name.empty())
       source_proto->set_publisher_name(source.publisher_name);
     if (source.amp_url.is_valid())
       source_proto->set_amp_url(source.amp_url.spec());
   }
 
   return result;
 }
 
 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_);
   result->set_publish_date(publish_date_);
   result->set_publisher_name(best_source().publisher_name);
   result->set_score(score_);
   return result;
 }
 
 // static
@@ skipping 28 matching lines @@
       best_source_index_ = i;
       if (!source.amp_url.is_empty()) {
         // This is the best possible source, stop looking.
         break;
       }
     }
   }
 }
 
 }  // namespace ntp_snippets