Add ContentSuggestion, ContentSuggestionCategory and ContentSuggestionProviderType

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/content_suggestions_provider_type.h>

[Marc Treib, 2016/06/27 12:25:36]

Here too

[Philipp Keck, 2016/06/27 12:46:53]

Done.

 #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/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) {
   const base::DictionaryValue* time_value;
   int seconds = 0, nanos = 0;
@@ skipping 222 matching lines @@
     source_proto->set_url(source.url.spec());
     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));
+  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
 base::Time NTPSnippet::TimeFromJsonString(const std::string& timestamp_str) {
   int64_t timestamp;
   if (!base::StringToInt64(timestamp_str, &timestamp)) {
     // Even if there's an error in the conversion, some garbage data may still
     // be written to the output var, so reset it.
     timestamp = 0;
   }
   return base::Time::UnixEpoch() + base::TimeDelta::FromSeconds(timestamp);
 }
@@ skipping 19 matching lines @@
       best_source_index_ = i;
       if (!source.amp_url.is_empty()) {
         // This is the best possible source, stop looking.
         break;
       }
     }
   }
 }
 
 }  // namespace ntp_snippets