Make ContentSuggestionsService recognize new/removed categories

components/ntp_snippets/content_suggestions_service.h

Index: components/ntp_snippets/content_suggestions_service.h
diff --git a/components/ntp_snippets/content_suggestions_service.h b/components/ntp_snippets/content_suggestions_service.h
index 24be9beacb519b6e7af1ceda6490aad8c2a964c5..6043bfde0d5759b9531392eb1c7c1f99465fec8a 100644
--- a/components/ntp_snippets/content_suggestions_service.h
+++ b/components/ntp_snippets/content_suggestions_service.h
@@ -126,14 +126,19 @@ class ContentSuggestionsService : public KeyedService,
   };
 
   // Implementation of ContentSuggestionsProvider::Observer.
-  void OnNewSuggestions(Category changed_category,
+  void OnNewSuggestions(ContentSuggestionsProvider* provider,
+                        Category category,
                         std::vector<ContentSuggestion> suggestions) override;
-  void OnCategoryStatusChanged(Category changed_category,
+  void OnCategoryStatusChanged(ContentSuggestionsProvider* provider,
+                               Category category,
                                CategoryStatus new_status) override;
   void OnProviderShutdown(ContentSuggestionsProvider* provider) override;
 
-  // Checks whether a provider for the given |category| is registered.
-  bool IsCategoryRegistered(Category category) const;
+  // Ensures the given |provider| is is registered for the given |category|.
+  // Returns true if the category was newly registered, false if it was present
+  // before.
+  bool EnsureCategoryRegistered(ContentSuggestionsProvider* provider,

[Marc Treib, 2016/08/01 14:23:38]

EnsureCategoryIsRegistered?

[Philipp Keck, 2016/08/01 14:59:04]

Acknowledged.

+                                Category category);
 
   // Fires the OnCategoryStatusChanged event for the given |category|.
   void NotifyCategoryStatusChanged(Category category);