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/ntp_snippet.h"
 
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "base/values.h"
 #include "components/ntp_snippets/proto/ntp_snippets.pb.h"
+#include "components/ntp_snippets/snippet.h"
+#include "components/ntp_snippets/snippet_category.h"
+#include "components/ntp_snippets/snippet_provider_type.h"
 
 namespace {
 
 const char kScore[] = "score";
 const char kContentInfo[] = "contentInfo";
 
 const char kId[] = "url";
 const char kTitle[] = "title";
 const char kSalientImageUrl[] = "thumbnailUrl";
 const char kSnippet[] = "snippet";
 const char kPublishDate[] = "creationTimestampSec";
 const char kExpiryDate[] = "expiryTimestampSec";
 const char kSiteTitle[] = "sourceName";
 const char kPublisherData[] = "publisherData";
 const char kCorpusId[] = "corpusId";
 const char kSourceCorpusInfo[] = "sourceCorpusInfo";
 const char kAmpUrl[] = "ampUrl";
 
 }  // namespace
 
+// TODO IMPORTANT NOTE: This class will move to a sub-namespace and be renamed
+// ArticleSnippet. It will only be used for snippets from Chrome Reader.
+// When accessing snippets for all usages towards the UI, use the new "Snippet"
+// class through the "SnippetService" instead.
+
 namespace ntp_snippets {
 
 NTPSnippet::NTPSnippet(const std::string& id)
     : id_(id), score_(0), is_discarded_(false), best_source_index_(0) {}
 
 NTPSnippet::~NTPSnippet() {}
 
 // static
 std::unique_ptr<NTPSnippet> NTPSnippet::CreateFromDictionary(
     const base::DictionaryValue& dict) {
@@ skipping 173 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<Snippet> NTPSnippet::ToSnippet() const {
+  std::unique_ptr<Snippet> result(new Snippet(
+      id_, SnippetProviderType::ARTICLES, SnippetCategory::ARTICLE));
+  result->set_url(best_source().url);
+  result->set_amp_url(best_source().amp_url);
+  result->set_title(title_);
+  result->set_text_extract(snippet_);
+  result->set_salient_image_url(salient_image_url_);
+  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