Add ContentSuggestionsCategoryFactory; Store categories as ints

components/ntp_snippets/ntp_snippets_service.h

Index: components/ntp_snippets/ntp_snippets_service.h
diff --git a/components/ntp_snippets/ntp_snippets_service.h b/components/ntp_snippets/ntp_snippets_service.h
index 0d4a1226f36ed6fe65f53fd3af1a4d9768402eb5..35544f679076b526ee2d258514a38de069fd93f4 100644
--- a/components/ntp_snippets/ntp_snippets_service.h
+++ b/components/ntp_snippets/ntp_snippets_service.h
@@ -21,6 +21,7 @@
 #include "components/keyed_service/core/keyed_service.h"
 #include "components/ntp_snippets/content_suggestion.h"
 #include "components/ntp_snippets/content_suggestions_category.h"
+#include "components/ntp_snippets/content_suggestions_category_factory.h"
 #include "components/ntp_snippets/content_suggestions_category_status.h"
 #include "components/ntp_snippets/content_suggestions_provider.h"
 #include "components/ntp_snippets/ntp_snippet.h"
@@ -82,7 +83,8 @@ class NTPSnippetsService : public KeyedService,
                      std::unique_ptr<image_fetcher::ImageFetcher> image_fetcher,
                      std::unique_ptr<image_fetcher::ImageDecoder> image_decoder,
                      std::unique_ptr<NTPSnippetsDatabase> database,
-                     std::unique_ptr<NTPSnippetsStatusService> status_service);
+                     std::unique_ptr<NTPSnippetsStatusService> status_service,
+                     ContentSuggestionsCategoryFactory* category_factory);

[Marc Treib, 2016/07/28 11:41:46]

I'd move this up to the other non-owned things, after suggestions_service.

[Philipp Keck, 2016/07/28 13:50:55]

Done.

 
   ~NTPSnippetsService() override;
 
@@ -139,6 +141,7 @@ class NTPSnippetsService : public KeyedService,
   // ContentSuggestionsProvider implementation
   // TODO(pke): At some point reorder the implementations in the .cc file
   // accordingly.
+  std::vector<ContentSuggestionsCategory> provided_categories() override;
   void SetObserver(Observer* observer) override;
   ContentSuggestionsCategoryStatus GetCategoryStatus(
       ContentSuggestionsCategory category) override;
@@ -323,6 +326,8 @@ class NTPSnippetsService : public KeyedService,
   // The fetch will be executed after the database load finishes.
   bool fetch_after_load_;
 
+  ContentSuggestionsCategory provided_category_;

[Marc Treib, 2016/07/28 11:41:46]

const?

[Philipp Keck, 2016/07/28 13:50:55]

Done.

+
   DISALLOW_COPY_AND_ASSIGN(NTPSnippetsService);
 };