Add a unit test for the BookmarkSuggestionsProvider.

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 <utility>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/strings/string_number_conversions.h"
-#include "base/strings/utf_string_conversions.h"
 #include "components/ntp_snippets/category_info.h"
 #include "components/ntp_snippets/category_rankers/constant_category_ranker.h"
 #include "components/ntp_snippets/category_rankers/fake_category_ranker.h"
 #include "components/ntp_snippets/category_rankers/mock_category_ranker.h"
 #include "components/ntp_snippets/category_status.h"
 #include "components/ntp_snippets/content_suggestion.h"
 #include "components/ntp_snippets/content_suggestions_provider.h"
+#include "components/ntp_snippets/mock_content_suggestions_provider.h"
 #include "components/ntp_snippets/user_classifier.h"
 #include "components/prefs/testing_pref_service.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/image/image.h"
 
 using testing::_;
 using testing::ElementsAre;
 using testing::Eq;
 using testing::InvokeWithoutArgs;
 using testing::IsEmpty;
 using testing::Mock;
 using testing::Property;
 using testing::Return;
 using testing::StrictMock;
 using testing::UnorderedElementsAre;
 
 namespace ntp_snippets {
 
 namespace {
 
-// TODO(treib): This is a weird combination of a mock and a fake. Fix this.
-class MockProvider : public ContentSuggestionsProvider {
- public:
-  MockProvider(Observer* observer,
-               const std::vector<Category>& provided_categories)
-      : ContentSuggestionsProvider(observer) {
-    SetProvidedCategories(provided_categories);
-  }
-
-  void SetProvidedCategories(const std::vector<Category>& provided_categories) {
-    statuses_.clear();
-    provided_categories_ = provided_categories;
-    for (Category category : provided_categories) {
-      statuses_[category.id()] = CategoryStatus::AVAILABLE;
-    }
-  }
-
-  CategoryStatus GetCategoryStatus(Category category) override {
-    return statuses_[category.id()];
-  }
-
-  CategoryInfo GetCategoryInfo(Category category) override {
-    return CategoryInfo(base::ASCIIToUTF16("Section title"),
-                        ContentSuggestionsCardLayout::FULL_CARD, true, false,
-                        true, false,
-                        base::ASCIIToUTF16("No suggestions message"));
-  }
-
-  void FireSuggestionsChanged(
-      Category category,
-      std::vector<ContentSuggestion> suggestions) {
-    observer()->OnNewSuggestions(this, category, std::move(suggestions));
-  }
-
-  void FireCategoryStatusChanged(Category category, CategoryStatus new_status) {
-    statuses_[category.id()] = new_status;
-    observer()->OnCategoryStatusChanged(this, category, new_status);
-  }
-
-  void FireCategoryStatusChangedWithCurrentStatus(Category category) {
-    observer()->OnCategoryStatusChanged(this, category,
-                                        statuses_[category.id()]);
-  }
-
-  void FireSuggestionInvalidated(const ContentSuggestion::ID& suggestion_id) {
-    observer()->OnSuggestionInvalidated(this, suggestion_id);
-  }
-
-  MOCK_METHOD3(ClearHistory,
-               void(base::Time begin,
-                    base::Time end,
-                    const base::Callback<bool(const GURL& url)>& filter));
-  MOCK_METHOD3(Fetch,
-               void(const Category&,
-                    const std::set<std::string>&,
-                    const FetchDoneCallback&));
-  MOCK_METHOD1(ClearCachedSuggestions, void(Category category));
-  MOCK_METHOD2(GetDismissedSuggestionsForDebugging,
-               void(Category category,
-                    const DismissedSuggestionsCallback& callback));
-  MOCK_METHOD1(ClearDismissedSuggestionsForDebugging, void(Category category));
-  MOCK_METHOD1(DismissSuggestion,
-               void(const ContentSuggestion::ID& suggestion_id));
-  MOCK_METHOD2(FetchSuggestionImage,
-               void(const ContentSuggestion::ID& suggestion_id,
-                    const ImageFetchedCallback& callback));
-
- private:
-  std::vector<Category> provided_categories_;
-  std::map<int, CategoryStatus> statuses_;
-};
-
 class MockServiceObserver : public ContentSuggestionsService::Observer {
  public:
   MockServiceObserver() = default;
   ~MockServiceObserver() override = default;
 
   MOCK_METHOD1(OnNewSuggestions, void(Category category));
   MOCK_METHOD2(OnCategoryStatusChanged,
                void(Category changed_category, CategoryStatus new_status));
   MOCK_METHOD1(OnSuggestionInvalidated,
                void(const ContentSuggestion::ID& suggestion_id));
@@ skipping 52 matching lines @@
   const std::map<Category, ContentSuggestionsProvider*, Category::CompareByID>&
   providers() {
     return service()->providers_by_category_;
   }
 
   const std::map<Category, ContentSuggestionsProvider*, Category::CompareByID>&
   dismissed_providers() {
     return service()->dismissed_providers_by_category_;
   }
 
-  MockProvider* MakeRegisteredMockProvider(Category provided_category) {
+  MockContentSuggestionsProvider* MakeRegisteredMockProvider(
+      Category provided_category) {
     return MakeRegisteredMockProvider(
         std::vector<Category>({provided_category}));
   }
 
-  MockProvider* MakeRegisteredMockProvider(
+  MockContentSuggestionsProvider* MakeRegisteredMockProvider(
       const std::vector<Category>& provided_categories) {
-    auto provider = base::MakeUnique<testing::StrictMock<MockProvider>>(
-        service(), provided_categories);
-    MockProvider* result = provider.get();
+    auto provider =
+        base::MakeUnique<testing::StrictMock<MockContentSuggestionsProvider>>(
+            service(), provided_categories);
+    MockContentSuggestionsProvider* result = provider.get();
     service()->RegisterProvider(std::move(provider));
     return result;
   }
 
   void SetCategoryRanker(std::unique_ptr<CategoryRanker> category_ranker) {
     category_ranker_ = std::move(category_ranker);
   }
 
   MOCK_METHOD1(OnImageFetched, void(const gfx::Image&));
 
@@ skipping 60 matching lines @@
       Category::FromKnownCategory(KnownCategories::ARTICLES);
   Category offline_pages_category =
       Category::FromKnownCategory(KnownCategories::DOWNLOADS);
   ASSERT_THAT(providers(), IsEmpty());
   EXPECT_THAT(service()->GetCategories(), IsEmpty());
   EXPECT_THAT(service()->GetCategoryStatus(articles_category),
               Eq(CategoryStatus::NOT_PROVIDED));
   EXPECT_THAT(service()->GetCategoryStatus(offline_pages_category),
               Eq(CategoryStatus::NOT_PROVIDED));
 
-  MockProvider* provider1 = MakeRegisteredMockProvider(articles_category);
+  MockContentSuggestionsProvider* provider1 =
+      MakeRegisteredMockProvider(articles_category);
   provider1->FireCategoryStatusChangedWithCurrentStatus(articles_category);
   EXPECT_THAT(providers().count(offline_pages_category), Eq(0ul));
   ASSERT_THAT(providers().count(articles_category), Eq(1ul));
   EXPECT_THAT(providers().at(articles_category), Eq(provider1));
   EXPECT_THAT(providers().size(), Eq(1ul));
   EXPECT_THAT(service()->GetCategories(),
               UnorderedElementsAre(articles_category));
   EXPECT_THAT(service()->GetCategoryStatus(articles_category),
               Eq(CategoryStatus::AVAILABLE));
   EXPECT_THAT(service()->GetCategoryStatus(offline_pages_category),
               Eq(CategoryStatus::NOT_PROVIDED));
 
-  MockProvider* provider2 = MakeRegisteredMockProvider(offline_pages_category);
+  MockContentSuggestionsProvider* provider2 =
+      MakeRegisteredMockProvider(offline_pages_category);
   provider2->FireCategoryStatusChangedWithCurrentStatus(offline_pages_category);
   ASSERT_THAT(providers().count(offline_pages_category), Eq(1ul));
   EXPECT_THAT(providers().at(articles_category), Eq(provider1));
   ASSERT_THAT(providers().count(articles_category), Eq(1ul));
   EXPECT_THAT(providers().at(offline_pages_category), Eq(provider2));
   EXPECT_THAT(providers().size(), Eq(2ul));
   EXPECT_THAT(service()->GetCategories(),
               UnorderedElementsAre(offline_pages_category, articles_category));
   EXPECT_THAT(service()->GetCategoryStatus(articles_category),
               Eq(CategoryStatus::AVAILABLE));
@@ skipping 16 matching lines @@
   EXPECT_THAT(service()->GetCategories(), IsEmpty());
   EXPECT_THAT(service()->GetSuggestionsForCategory(articles_category),
               IsEmpty());
 }
 
 TEST_F(ContentSuggestionsServiceTest, ShouldRedirectFetchSuggestionImage) {
   Category articles_category =
       Category::FromKnownCategory(KnownCategories::ARTICLES);
   Category offline_pages_category =
       Category::FromKnownCategory(KnownCategories::DOWNLOADS);
-  MockProvider* provider1 = MakeRegisteredMockProvider(articles_category);
-  MockProvider* provider2 = MakeRegisteredMockProvider(offline_pages_category);
+  MockContentSuggestionsProvider* provider1 =
+      MakeRegisteredMockProvider(articles_category);
+  MockContentSuggestionsProvider* provider2 =
+      MakeRegisteredMockProvider(offline_pages_category);
 
   provider1->FireSuggestionsChanged(articles_category,
                                     CreateSuggestions(articles_category, {1}));
   ContentSuggestion::ID suggestion_id(articles_category, "1");
 
   EXPECT_CALL(*provider1, FetchSuggestionImage(suggestion_id, _));
   EXPECT_CALL(*provider2, FetchSuggestionImage(_, _)).Times(0);
   service()->FetchSuggestionImage(
       suggestion_id, base::Bind(&ContentSuggestionsServiceTest::OnImageFetched,
                                 base::Unretained(this)));
@@ skipping 13 matching lines @@
       suggestion_id, base::Bind(&ContentSuggestionsServiceTest::OnImageFetched,
                                 base::Unretained(this)));
   run_loop.Run();
 }
 
 TEST_F(ContentSuggestionsServiceTest, ShouldRedirectDismissSuggestion) {
   Category articles_category =
       Category::FromKnownCategory(KnownCategories::ARTICLES);
   Category offline_pages_category =
       Category::FromKnownCategory(KnownCategories::DOWNLOADS);
-  MockProvider* provider1 = MakeRegisteredMockProvider(articles_category);
-  MockProvider* provider2 = MakeRegisteredMockProvider(offline_pages_category);
+  MockContentSuggestionsProvider* provider1 =
+      MakeRegisteredMockProvider(articles_category);
+  MockContentSuggestionsProvider* provider2 =
+      MakeRegisteredMockProvider(offline_pages_category);
 
   provider2->FireSuggestionsChanged(
       offline_pages_category, CreateSuggestions(offline_pages_category, {11}));
   ContentSuggestion::ID suggestion_id(offline_pages_category, "11");
 
   EXPECT_CALL(*provider1, DismissSuggestion(_)).Times(0);
   EXPECT_CALL(*provider2, DismissSuggestion(suggestion_id));
   service()->DismissSuggestion(suggestion_id);
 }
 
 TEST_F(ContentSuggestionsServiceTest, ShouldRedirectSuggestionInvalidated) {
   Category articles_category =
       Category::FromKnownCategory(KnownCategories::ARTICLES);
 
-  MockProvider* provider = MakeRegisteredMockProvider(articles_category);
+  MockContentSuggestionsProvider* provider =
+      MakeRegisteredMockProvider(articles_category);
   MockServiceObserver observer;
   service()->AddObserver(&observer);
 
   provider->FireSuggestionsChanged(
       articles_category, CreateSuggestions(articles_category, {11, 12, 13}));
   ExpectThatSuggestionsAre(articles_category, {11, 12, 13});
 
   ContentSuggestion::ID suggestion_id(articles_category, "12");
   EXPECT_CALL(observer, OnSuggestionInvalidated(suggestion_id));
   provider->FireSuggestionInvalidated(suggestion_id);
@@ skipping 12 matching lines @@
   service()->RemoveObserver(&observer);
 }
 
 TEST_F(ContentSuggestionsServiceTest, ShouldForwardSuggestions) {
   Category articles_category =
       Category::FromKnownCategory(KnownCategories::ARTICLES);
   Category offline_pages_category =
       Category::FromKnownCategory(KnownCategories::DOWNLOADS);
 
   // Create and register providers
-  MockProvider* provider1 = MakeRegisteredMockProvider(articles_category);
+  MockContentSuggestionsProvider* provider1 =
+      MakeRegisteredMockProvider(articles_category);
   provider1->FireCategoryStatusChangedWithCurrentStatus(articles_category);
-  MockProvider* provider2 = MakeRegisteredMockProvider(offline_pages_category);
+  MockContentSuggestionsProvider* provider2 =
+      MakeRegisteredMockProvider(offline_pages_category);
   provider2->FireCategoryStatusChangedWithCurrentStatus(offline_pages_category);
   ASSERT_THAT(providers().count(articles_category), Eq(1ul));
   EXPECT_THAT(providers().at(articles_category), Eq(provider1));
   ASSERT_THAT(providers().count(offline_pages_category), Eq(1ul));
   EXPECT_THAT(providers().at(offline_pages_category), Eq(provider2));
 
   // Create and register observer
   MockServiceObserver observer;
   service()->AddObserver(&observer);
 
@@ skipping 51 matching lines @@
 
 TEST_F(ContentSuggestionsServiceTest,
        ShouldNotReturnCategoryInfoForNonexistentCategory) {
   Category category = Category::FromKnownCategory(KnownCategories::DOWNLOADS);
   base::Optional<CategoryInfo> result = service()->GetCategoryInfo(category);
   EXPECT_FALSE(result.has_value());
 }
 
 TEST_F(ContentSuggestionsServiceTest, ShouldReturnCategoryInfo) {
   Category category = Category::FromKnownCategory(KnownCategories::DOWNLOADS);
-  MockProvider* provider = MakeRegisteredMockProvider(category);
+  MockContentSuggestionsProvider* provider =
+      MakeRegisteredMockProvider(category);
   provider->FireCategoryStatusChangedWithCurrentStatus(category);
   base::Optional<CategoryInfo> result = service()->GetCategoryInfo(category);
   ASSERT_TRUE(result.has_value());
   CategoryInfo expected = provider->GetCategoryInfo(category);
   const CategoryInfo& actual = result.value();
   EXPECT_THAT(expected.title(), Eq(actual.title()));
   EXPECT_THAT(expected.card_layout(), Eq(actual.card_layout()));
   EXPECT_THAT(expected.has_more_action(), Eq(actual.has_more_action()));
   EXPECT_THAT(expected.has_reload_action(), Eq(actual.has_reload_action()));
   EXPECT_THAT(expected.has_view_all_action(), Eq(actual.has_view_all_action()));
 }
 
 TEST_F(ContentSuggestionsServiceTest,
        ShouldRegisterNewCategoryOnNewSuggestions) {
   Category category = Category::FromKnownCategory(KnownCategories::DOWNLOADS);
-  MockProvider* provider = MakeRegisteredMockProvider(category);
+  MockContentSuggestionsProvider* provider =
+      MakeRegisteredMockProvider(category);
   provider->FireCategoryStatusChangedWithCurrentStatus(category);
   MockServiceObserver observer;
   service()->AddObserver(&observer);
 
   // Provider starts providing |new_category| without calling
   // |OnCategoryStatusChanged|. This is supported for now until further
   // reconsideration.
   Category new_category =
       Category::FromKnownCategory(KnownCategories::ARTICLES);
   provider->SetProvidedCategories(
@@ skipping 14 matching lines @@
   EXPECT_THAT(providers().at(new_category), Eq(provider));
   EXPECT_THAT(service()->GetCategoryStatus(new_category),
               Eq(CategoryStatus::AVAILABLE));
 
   service()->RemoveObserver(&observer);
 }
 
 TEST_F(ContentSuggestionsServiceTest,
        ShouldRegisterNewCategoryOnCategoryStatusChanged) {
   Category category = Category::FromKnownCategory(KnownCategories::DOWNLOADS);
-  MockProvider* provider = MakeRegisteredMockProvider(category);
+  MockContentSuggestionsProvider* provider =
+      MakeRegisteredMockProvider(category);
   provider->FireCategoryStatusChangedWithCurrentStatus(category);
   MockServiceObserver observer;
   service()->AddObserver(&observer);
 
   // Provider starts providing |new_category| and calls
   // |OnCategoryStatusChanged|, but the category is not yet available.
   Category new_category =
       Category::FromKnownCategory(KnownCategories::ARTICLES);
   provider->SetProvidedCategories(
       std::vector<Category>({category, new_category}));
   EXPECT_CALL(observer, OnCategoryStatusChanged(new_category,
                                                 CategoryStatus::INITIALIZING));
   provider->FireCategoryStatusChanged(new_category,
                                       CategoryStatus::INITIALIZING);
 
   ASSERT_THAT(providers().count(new_category), Eq(1ul));
   EXPECT_THAT(providers().at(new_category), Eq(provider));
   ExpectThatSuggestionsAre(new_category, std::vector<int>());
   EXPECT_THAT(service()->GetCategoryStatus(new_category),
               Eq(CategoryStatus::INITIALIZING));
   EXPECT_THAT(service()->GetCategories(),
               UnorderedElementsAre(category, new_category));
 
   service()->RemoveObserver(&observer);
 }
 
 TEST_F(ContentSuggestionsServiceTest, ShouldRemoveCategoryWhenNotProvided) {
   Category category = Category::FromKnownCategory(KnownCategories::DOWNLOADS);
-  MockProvider* provider = MakeRegisteredMockProvider(category);
+  MockContentSuggestionsProvider* provider =
+      MakeRegisteredMockProvider(category);
   MockServiceObserver observer;
   service()->AddObserver(&observer);
 
   provider->FireSuggestionsChanged(category,
                                    CreateSuggestions(category, {1, 2}));
   ExpectThatSuggestionsAre(category, {1, 2});
 
   EXPECT_CALL(observer,
               OnCategoryStatusChanged(category, CategoryStatus::NOT_PROVIDED));
   provider->FireCategoryStatusChanged(category, CategoryStatus::NOT_PROVIDED);
 
   EXPECT_THAT(service()->GetCategoryStatus(category),
               Eq(CategoryStatus::NOT_PROVIDED));
   EXPECT_TRUE(service()->GetCategories().empty());
   ExpectThatSuggestionsAre(category, std::vector<int>());
 
   service()->RemoveObserver(&observer);
 }
 
 TEST_F(ContentSuggestionsServiceTest, ShouldForwardClearHistoryToProviders) {
   Category category = Category::FromKnownCategory(KnownCategories::DOWNLOADS);
-  MockProvider* provider = MakeRegisteredMockProvider(category);
+  MockContentSuggestionsProvider* provider =
+      MakeRegisteredMockProvider(category);
   base::Time begin = base::Time::FromTimeT(123);
   base::Time end = base::Time::FromTimeT(456);
   EXPECT_CALL(*provider, ClearHistory(begin, end, _));
   base::Callback<bool(const GURL& url)> filter;
   service()->ClearHistory(begin, end, filter);
 }
 
 TEST_F(ContentSuggestionsServiceTest,
        ShouldForwardClearHistoryToCategoryRanker) {
   auto mock_ranker = base::MakeUnique<MockCategoryRanker>();
   MockCategoryRanker* raw_mock_ranker = mock_ranker.get();
   SetCategoryRanker(std::move(mock_ranker));
 
   // The service is recreated to pick up the new ranker.
   ResetService();
 
   base::Time begin = base::Time::FromTimeT(123),
              end = base::Time::FromTimeT(456);
   EXPECT_CALL(*raw_mock_ranker, ClearHistory(begin, end));
   base::Callback<bool(const GURL& url)> filter;
   service()->ClearHistory(begin, end, filter);
 }
 
 TEST_F(ContentSuggestionsServiceTest, ShouldForwardDeleteAllHistoryURLs) {
   StrictMock<MockServiceObserver> observer;
   service()->AddObserver(&observer);
   EXPECT_CALL(observer, OnFullRefreshRequired());
 
   Category category = Category::FromKnownCategory(KnownCategories::DOWNLOADS);
-  MockProvider* provider = MakeRegisteredMockProvider(category);
+  MockContentSuggestionsProvider* provider =
+      MakeRegisteredMockProvider(category);
   EXPECT_CALL(*provider, ClearHistory(base::Time(), base::Time::Max(), _));
   static_cast<history::HistoryServiceObserver*>(service())->OnURLsDeleted(
       /*history_service=*/nullptr, /*all_history=*/true, /*expired=*/false,
       history::URLRows(), /*favicon_urls=*/std::set<GURL>());
 
   service()->RemoveObserver(&observer);
 }
 
 TEST_F(ContentSuggestionsServiceTest, ShouldIgnoreExpiredURLDeletions) {
   Category category = Category::FromKnownCategory(KnownCategories::DOWNLOADS);
@@ skipping 37 matching lines @@
       /*favicon_urls=*/std::set<GURL>());
 }
 
 TEST_F(ContentSuggestionsServiceTest,
        ShouldClearHistoryForMultipleURLDeletion) {
   StrictMock<MockServiceObserver> observer;
   service()->AddObserver(&observer);
   EXPECT_CALL(observer, OnFullRefreshRequired());
 
   Category category = Category::FromKnownCategory(KnownCategories::DOWNLOADS);
-  MockProvider* provider = MakeRegisteredMockProvider(category);
+  MockContentSuggestionsProvider* provider =
+      MakeRegisteredMockProvider(category);
   EXPECT_CALL(*provider, ClearHistory(base::Time(), base::Time::Max(), _));
 
   static_cast<history::HistoryServiceObserver*>(service())->OnURLsDeleted(
       /*history_service=*/nullptr, /*all_history=*/false,
       /*expired=*/false,
       history::URLRows({history::URLRow(GURL("http://google.com")),
                         history::URLRow(GURL("http://youtube.com"))}),
       /*favicon_urls=*/std::set<GURL>());
 
   service()->RemoveObserver(&observer);
 }
 
 TEST_F(ContentSuggestionsServiceTest, ShouldForwardFetch) {
   Category category = Category::FromKnownCategory(KnownCategories::ARTICLES);
   std::set<std::string> known_suggestions;
-  MockProvider* provider = MakeRegisteredMockProvider(category);
+  MockContentSuggestionsProvider* provider =
+      MakeRegisteredMockProvider(category);
   provider->FireCategoryStatusChangedWithCurrentStatus(category);
   EXPECT_CALL(*provider, Fetch(category, known_suggestions, _));
   service()->Fetch(category, known_suggestions, FetchDoneCallback());
 }
 
 TEST_F(ContentSuggestionsServiceTest, DismissAndRestoreCategory) {
   // Register a category with one suggestion.
   Category category = Category::FromKnownCategory(KnownCategories::ARTICLES);
-  MockProvider* provider = MakeRegisteredMockProvider(category);
+  MockContentSuggestionsProvider* provider =
+      MakeRegisteredMockProvider(category);
   provider->FireCategoryStatusChangedWithCurrentStatus(category);
   provider->FireSuggestionsChanged(category, CreateSuggestions(category, {42}));
 
   EXPECT_THAT(service()->GetCategories(), UnorderedElementsAre(category));
   EXPECT_THAT(service()->GetCategoryStatus(category),
               Eq(CategoryStatus::AVAILABLE));
   ExpectThatSuggestionsAre(category, {42});
   EXPECT_THAT(providers().count(category), Eq(1ul));
   EXPECT_THAT(dismissed_providers(), IsEmpty());
 
@@ skipping 18 matching lines @@
   EXPECT_THAT(providers().count(category), Eq(1ul));
   EXPECT_THAT(dismissed_providers(), IsEmpty());
 }
 
 TEST_F(ContentSuggestionsServiceTest, ShouldRestoreDismissedCategories) {
   // Create and register provider.
   Category category1 = Category::FromIDValue(1);
   Category category2 = Category::FromIDValue(2);
 
   // Setup and verify initial state.
-  MockProvider* provider = MakeRegisteredMockProvider({category1, category2});
+  MockContentSuggestionsProvider* provider =
+      MakeRegisteredMockProvider({category1, category2});
   provider->FireCategoryStatusChangedWithCurrentStatus(category1);
   provider->FireCategoryStatusChangedWithCurrentStatus(category2);
 
   ASSERT_THAT(service()->GetCategoryStatus(category1),
               Eq(CategoryStatus::AVAILABLE));
   ASSERT_THAT(service()->GetCategoryStatus(category2),
               Eq(CategoryStatus::AVAILABLE));
 
   // Dismiss all the categories. None should be provided now.
   service()->DismissCategory(category1);
@@ skipping 26 matching lines @@
 
   EXPECT_THAT(service()->GetCategoryStatus(category1),
               Eq(CategoryStatus::AVAILABLE));
   EXPECT_THAT(service()->GetCategoryStatus(category2),
               Eq(CategoryStatus::NOT_PROVIDED));
 }
 
 TEST_F(ContentSuggestionsServiceTest, ShouldRestoreDismissalsFromPrefs) {
   // Register a category with one suggestion.
   Category category = Category::FromKnownCategory(KnownCategories::ARTICLES);
-  MockProvider* provider = MakeRegisteredMockProvider(category);
+  MockContentSuggestionsProvider* provider =
+      MakeRegisteredMockProvider(category);
   provider->FireCategoryStatusChangedWithCurrentStatus(category);
 
   // For a regular initialisation, the category is not dismissed.
   ASSERT_FALSE(service()->IsCategoryDismissed(category));
 
   // Dismiss the category.
   service()->DismissCategory(category);
   ASSERT_TRUE(service()->IsCategoryDismissed(category));
 
   // Simulate a Chrome restart. The category should still be dismissed.
@@ skipping 17 matching lines @@
 
   auto fake_ranker = base::MakeUnique<FakeCategoryRanker>();
   FakeCategoryRanker* raw_fake_ranker = fake_ranker.get();
   SetCategoryRanker(std::move(fake_ranker));
 
   raw_fake_ranker->SetOrder({first_category, second_category});
 
   // The service is recreated to pick up the new ranker.
   ResetService();
 
-  MockProvider* provider =
+  MockContentSuggestionsProvider* provider =
       MakeRegisteredMockProvider({first_category, second_category});
   provider->FireCategoryStatusChangedWithCurrentStatus(first_category);
   provider->FireCategoryStatusChangedWithCurrentStatus(second_category);
 
   EXPECT_THAT(service()->GetCategories(),
               ElementsAre(first_category, second_category));
 
   // The order to display (in the ranker) changes.
   raw_fake_ranker->SetOrder({second_category, first_category});
 
   // Categories order should reflect the new order.
   EXPECT_THAT(service()->GetCategories(),
               ElementsAre(second_category, first_category));
 }
 
 TEST_F(ContentSuggestionsServiceTest,
        ShouldForwardDismissedCategoryToCategoryRanker) {
   auto mock_ranker = base::MakeUnique<MockCategoryRanker>();
   MockCategoryRanker* raw_mock_ranker = mock_ranker.get();
   SetCategoryRanker(std::move(mock_ranker));
 
   // The service is recreated to pick up the new ranker.
   ResetService();
 
   Category category = Category::FromKnownCategory(KnownCategories::BOOKMARKS);
-  MockProvider* provider = MakeRegisteredMockProvider(category);
+  MockContentSuggestionsProvider* provider =
+      MakeRegisteredMockProvider(category);
   provider->FireCategoryStatusChangedWithCurrentStatus(category);
 
   EXPECT_CALL(*raw_mock_ranker, OnCategoryDismissed(category));
   service()->DismissCategory(category);
 }
 
 }  // namespace ntp_snippets