Make ContentSuggestionsService recognize new/removed categories

components/ntp_snippets/content_suggestions_service_unittest.cc

 // Copyright 2016 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.
 
 #include "components/ntp_snippets/content_suggestions_service.h"
 
 #include <memory>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 58 matching lines @@
 
   Observer* observer() { return observer_; }
 
   void SetObserver(Observer* observer) override { observer_ = observer; }
 
   CategoryStatus GetCategoryStatus(Category category) {
     return statuses_[category.id()];
   }
 
   void FireSuggestionsChanged(Category category, std::vector<int> numbers) {
-    observer_->OnNewSuggestions(category, CreateSuggestions(numbers));
+    observer_->OnNewSuggestions(this, category, CreateSuggestions(numbers));
   }
 
   void FireCategoryStatusChanged(Category category, CategoryStatus new_status) {
     statuses_[category.id()] = new_status;
-    observer_->OnCategoryStatusChanged(category, new_status);
+    observer_->OnCategoryStatusChanged(this, category, new_status);
   }
 
   void FireShutdown() {
     observer_->OnProviderShutdown(this);
     observer_ = nullptr;
   }
 
   MOCK_METHOD0(ClearCachedSuggestionsForDebugging, void());
   MOCK_METHOD0(ClearDismissedSuggestionsForDebugging, void());
   MOCK_METHOD1(DismissSuggestion, void(const std::string& suggestion_id));
@@ skipping 54 matching lines @@
     for (int number : numbers) {
       ADD_FAILURE() << "Suggestion number " << number
                     << " not present, though expected";
     }
   }
 
   const std::map<Category,
                  ContentSuggestionsProvider*,
                  ContentSuggestionsService::CompareCategoriesByID>&
   providers() {
-    return service()->providers_;
+    return service()->providers_by_category_;
   }
 
   CategoryFactory* category_factory() { return service()->category_factory(); }
 
   Category FromKnownCategory(KnownCategories known_category) {
     return service()->category_factory()->FromKnownCategory(known_category);
   }
 
   MOCK_METHOD2(OnImageFetched,
                void(const std::string& suggestion_id, const gfx::Image&));
@@ skipping 230 matching lines @@
               Eq(CategoryStatus::NOT_PROVIDED));
 
   // Shutdown the service
   EXPECT_CALL(observer, ContentSuggestionsServiceShutdown());
   service()->Shutdown();
   service()->RemoveObserver(&observer);
   // The service will receive two Shutdown() calls.
 }
 
 }  // namespace ntp_snippets