Add ContentSuggestion, ContentSuggestionCategory and ContentSuggestionProviderType

components/ntp_snippets/ntp_snippet.h

Index: components/ntp_snippets/ntp_snippet.h
diff --git a/components/ntp_snippets/ntp_snippet.h b/components/ntp_snippets/ntp_snippet.h
index 745c246e9d619f3c6c390da482d41d776d5dbf3e..4d6908e6b82f6fff94bb92a4e384f1843f6c5f7b 100644
--- a/components/ntp_snippets/ntp_snippet.h
+++ b/components/ntp_snippets/ntp_snippet.h
@@ -11,6 +11,7 @@
 
 #include "base/macros.h"
 #include "base/time/time.h"
+#include "components/ntp_snippets/snippet.h"
 #include "url/gurl.h"
 
 namespace base {
@@ -32,6 +33,11 @@ struct SnippetSource {
   GURL amp_url;
 };
 
+// TODO IMPORTANT NOTE: This class will move to a sub-namespace and be renamed

[Marc Treib, 2016/06/13 13:08:17]

TODOs should always have someone assigned, as in:
// TODO(pke): ...
(this exact format, for easy greppability etc)

I'd split this into two parts, the "IMPORTANT NOTE" (for other devs), and then a
TODO for yourself to actually do the rename.

However: Right now, this comment references a class that doesn't exist yet
("SnippetService"). That's the kind of inconsistency we'd like to avoid. So, two
options:
- Add the new SnippetsService class in this CL too, or
- remove this comment again, and add it back in the CL that actually adds the
SnippetsService.

[Philipp Keck, 2016/06/13 14:13:14]

Done.

[Philipp Keck, 2016/06/13 14:13:14]

Ok. I don't need the TODO comment for myself because that's the next thing I'm
doing anyway, so it's on my private todo list. I just added it because many IDEs
will then highlight the line, but in that case I'll just remove the TODO marker.

I will remove those comments and re-add them when necessary.

+// 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.
+
 class NTPSnippet {
  public:
   using PtrVector = std::vector<std::unique_ptr<NTPSnippet>>;
@@ -125,6 +131,11 @@ class NTPSnippet {
   bool is_discarded() const { return is_discarded_; }
   void set_discarded(bool discarded) { is_discarded_ = discarded; }
 
+  // TODO IMPORTANT NOTE This method is confusingly named because of upcoming
+  // changes to the names: NTPSnippet will become ArticleSnippet.
+  // TODO (pke) Instead of converting, ArticleSnippet might inherit Snippet?

[Marc Treib, 2016/06/13 13:08:17]

Probably not :)  But anyway, this is the kind of thing that's better served by a
personal todo list, rather than a comment in the code.

[Philipp Keck, 2016/06/13 14:13:14]

Done.

+  std::unique_ptr<Snippet> ToSnippet() const;
+
   // Public for testing.
   static base::Time TimeFromJsonString(const std::string& timestamp_str);
   static std::string TimeToJsonString(const base::Time& time);