[NTP Snippets] Persist non-article remote suggestions in the DB

components/ntp_snippets/remote/ntp_snippet.h

 // 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.
 
 #ifndef COMPONENTS_NTP_SNIPPETS_REMOTE_NTP_SNIPPET_H_
 #define COMPONENTS_NTP_SNIPPETS_REMOTE_NTP_SNIPPET_H_
 
 #include <map>
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "base/macros.h"
 #include "base/time/time.h"
-#include "components/ntp_snippets/category.h"
 #include "url/gurl.h"
 
 namespace base {
 class DictionaryValue;
 }  // namespace base
 
 namespace ntp_snippets {
 
 class SnippetProto;
 
 struct SnippetSource {
   SnippetSource(const GURL& url,
                 const std::string& publisher_name,
                 const GURL& amp_url)
       : url(url), publisher_name(publisher_name), amp_url(amp_url) {}
   GURL url;
   std::string publisher_name;
   GURL amp_url;
 };
 
 class NTPSnippet {
  public:
   using PtrVector = std::vector<std::unique_ptr<NTPSnippet>>;
 
   // Creates a new snippet with the given |id|.
   // Public for testing only - create snippets using the Create* methods below.
   // TODO(treib): Make this private and add a CreateSnippetForTest?
-  explicit NTPSnippet(const std::string& id);
+  explicit NTPSnippet(const std::string& id, int remote_category_id);

[Bernhard Bauer, 2016/10/10 13:54:54]

Nit: no explicit anymore

[Marc Treib, 2016/10/10 15:54:47]

Done.

 
   ~NTPSnippet();
 
   // Creates an NTPSnippet from a dictionary, as returned by Chrome Reader.
   // Returns a null pointer if the dictionary doesn't correspond to a valid
   // snippet. The keys in the dictionary are expected to be the same as the
   // property name, with exceptions documented in the property comment.
   static std::unique_ptr<NTPSnippet> CreateFromChromeReaderDictionary(
       const base::DictionaryValue& dict);
 
   // Creates an NTPSnippet from a dictionary, as returned by Chrome Content
   // Suggestions. Returns a null pointer if the dictionary doesn't correspond to
   // a valid snippet. Maps field names to Chrome Reader field names.
   static std::unique_ptr<NTPSnippet> CreateFromContentSuggestionsDictionary(
-      const base::DictionaryValue& dict);
+      const base::DictionaryValue& dict,
+      int remote_category_id);
 
   // Creates an NTPSnippet from a protocol buffer. Returns a null pointer if the
   // protocol buffer doesn't correspond to a valid snippet.
   static std::unique_ptr<NTPSnippet> CreateFromProto(const SnippetProto& proto);
 
   // Creates a protocol buffer corresponding to this snippet, for persisting.
   SnippetProto ToProto() const;
 
   // A unique ID for identifying the snippet. If initialized by
   // CreateFromChromeReaderDictionary() the relevant key is 'url'.
-  // TODO(treib): For now, the ID has to be a valid URL spec, otherwise
-  // fetching the salient image will fail. See TODO in ntp_snippets_service.cc.
   const std::string& id() const { return id_; }
 
   // Title of the snippet.
   const std::string& title() const { return title_; }
   void set_title(const std::string& title) { title_ = title; }
 
   // Summary or relevant extract from the content.
   const std::string& snippet() const { return snippet_; }
   void set_snippet(const std::string& snippet) { snippet_ = snippet; }
 
@@ skipping 39 matching lines @@
            !publish_date().is_null() && !expiry_date().is_null() &&
            !best_source().publisher_name.empty();
   }
 
   float score() const { return score_; }
   void set_score(float score) { score_ = score; }
 
   bool is_dismissed() const { return is_dismissed_; }
   void set_dismissed(bool dismissed) { is_dismissed_ = dismissed; }
 
+  // The ID of the remote category this snippet belongs to, for use with
+  // CategoryFactory::FromRemoteCategory.
+  int remote_category_id() const { return remote_category_id_; }
+
   // Public for testing.
   static base::Time TimeFromJsonString(const std::string& timestamp_str);
   static std::string TimeToJsonString(const base::Time& time);
 
  private:
   void FindBestSource();
 
   std::string id_;
   std::string title_;
   GURL salient_image_url_;
   std::string snippet_;
   base::Time publish_date_;
   base::Time expiry_date_;
   float score_;
   bool is_dismissed_;
+  int remote_category_id_;
 
   size_t best_source_index_;
 
   std::vector<SnippetSource> sources_;
 
   DISALLOW_COPY_AND_ASSIGN(NTPSnippet);
 };
 
 }  // namespace ntp_snippets
 
 #endif  // COMPONENTS_NTP_SNIPPETS_REMOTE_NTP_SNIPPET_H_