Combine all suggestions factories into ContentSuggestionsServiceFactory

components/ntp_snippets/content_suggestions_service.cc

Index: components/ntp_snippets/content_suggestions_service.cc
diff --git a/components/ntp_snippets/content_suggestions_service.cc b/components/ntp_snippets/content_suggestions_service.cc
index 362b1d8bda00fa776c55e646cec983651011c4d5..54bb5e806203aa2622ef6fd109e49d26771063e7 100644
--- a/components/ntp_snippets/content_suggestions_service.cc
+++ b/components/ntp_snippets/content_suggestions_service.cc
@@ -25,10 +25,11 @@ ContentSuggestionsService::ContentSuggestionsService(State state)
 ContentSuggestionsService::~ContentSuggestionsService() {}
 
 void ContentSuggestionsService::Shutdown() {
-  DCHECK(providers_by_category_.empty());
-  DCHECK(categories_.empty());
-  DCHECK(suggestions_by_category_.empty());
-  DCHECK(id_category_map_.empty());
+  id_category_map_.clear();
+  suggestions_by_category_.clear();
+  providers_by_category_.clear();
+  categories_.clear();
+  providers_.clear();

[Marc Treib, 2016/08/03 11:53:23]

Also reset ntp_snippets_service_

[Philipp Keck, 2016/08/03 12:28:24]

Done.

   state_ = State::DISABLED;
   FOR_EACH_OBSERVER(Observer, observers_, ContentSuggestionsServiceShutdown());
 }
@@ -127,19 +128,15 @@ void ContentSuggestionsService::RemoveObserver(Observer* observer) {
 }
 
 void ContentSuggestionsService::RegisterProvider(
-    ContentSuggestionsProvider* provider) {
-  // TODO(pke): When NTPSnippetsService is purely a provider, think about
-  // removing this state check.
-  if (state_ == State::DISABLED)
-    return;
-
-  provider->SetObserver(this);
+    std::unique_ptr<ContentSuggestionsProvider> provider) {
+  DCHECK(state_ == State::ENABLED);
   for (Category category : provider->GetProvidedCategories()) {
     DCHECK_NE(CategoryStatus::NOT_PROVIDED,
               provider->GetCategoryStatus(category));
-    RegisterCategoryIfRequired(provider, category);
+    RegisterCategoryIfRequired(provider.get(), category);
     NotifyCategoryStatusChanged(category);
   }
+  providers_.push_back(std::move(provider));
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -192,22 +189,6 @@ void ContentSuggestionsService::OnCategoryStatusChanged(
   NotifyCategoryStatusChanged(category);
 }
 
-void ContentSuggestionsService::OnProviderShutdown(
-    ContentSuggestionsProvider* provider) {
-  for (Category category : provider->GetProvidedCategories()) {
-    auto iterator = std::find(categories_.begin(), categories_.end(), category);
-    DCHECK(iterator != categories_.end());
-    categories_.erase(iterator);
-    for (const ContentSuggestion& suggestion :
-         suggestions_by_category_[category]) {
-      id_category_map_.erase(suggestion.id());
-    }
-    suggestions_by_category_.erase(category);
-    providers_by_category_.erase(category);
-    NotifyCategoryStatusChanged(category);
-  }
-}
-
 bool ContentSuggestionsService::RegisterCategoryIfRequired(
     ContentSuggestionsProvider* provider,
     Category category) {