[NTP::SectionOrder] Replace CategoryFactory with a category ranker.

chrome/browser/ntp_snippets/download_suggestions_provider_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 "chrome/browser/ntp_snippets/download_suggestions_provider.h"
 
 #include <memory>
 
 #include "base/bind.h"
 #include "base/observer_list.h"
 #include "base/strings/string_number_conversions.h"
 #include "chrome/browser/ntp_snippets/fake_download_item.h"
 #include "components/ntp_snippets/category.h"
-#include "components/ntp_snippets/category_factory.h"
 #include "components/ntp_snippets/mock_content_suggestions_provider_observer.h"
 #include "components/ntp_snippets/offline_pages/offline_pages_test_utils.h"
 #include "components/offline_pages/core/client_namespace_constants.h"
 #include "components/prefs/testing_pref_service.h"
 #include "content/public/test/mock_download_item.h"
 #include "content/public/test/mock_download_manager.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using content::DownloadItem;
 using content::MockDownloadManager;
 using ntp_snippets::Category;
-using ntp_snippets::CategoryFactory;
 using ntp_snippets::ContentSuggestion;
 using ntp_snippets::ContentSuggestionsProvider;
 using ntp_snippets::MockContentSuggestionsProviderObserver;
 using ntp_snippets::test::CaptureDismissedSuggestions;
 using ntp_snippets::test::FakeOfflinePageModel;
 using ntp_snippets::CategoryStatus;
 using offline_pages::ClientId;
 using offline_pages::OfflinePageItem;
 using test::FakeDownloadItem;
 using testing::_;
@@ skipping 213 matching lines @@
 
   void IgnoreOnSuggestionInvalidated() {
     EXPECT_CALL(observer_, OnSuggestionInvalidated(_, _)).Times(AnyNumber());
   }
 
   DownloadSuggestionsProvider* CreateProvider(bool show_assets,
                                               bool show_offline_pages) {
     DCHECK(!provider_);
     DCHECK(show_assets || show_offline_pages);
     provider_ = base::MakeUnique<DownloadSuggestionsProvider>(
-        &observer_, &category_factory_,
-        show_offline_pages ? &offline_pages_model_ : nullptr,
+        &observer_, show_offline_pages ? &offline_pages_model_ : nullptr,
         show_assets ? &downloads_manager_ : nullptr, pref_service(),
         /*download_manager_ui_enabled=*/false);
     return provider_.get();
   }
 
   void DestroyProvider() { provider_.reset(); }
 
   Category downloads_category() {
-    return category_factory_.FromKnownCategory(
+    return Category::FromKnownCategory(
         ntp_snippets::KnownCategories::DOWNLOADS);
   }
 
   void FireOfflinePageModelLoaded() {
     DCHECK(provider_);
     provider_->OfflinePageModelLoaded(&offline_pages_model_);
   }
 
   void AddOfflinePage(const offline_pages::OfflinePageItem& added_page) {
     DCHECK(provider_);
@@ skipping 41 matching lines @@
     return &downloads_manager_;
   }
   FakeOfflinePageModel* offline_pages_model() { return &offline_pages_model_; }
   MockContentSuggestionsProviderObserver* observer() { return &observer_; }
   TestingPrefServiceSimple* pref_service() { return pref_service_.get(); }
 
  private:
   ObservedMockDownloadManager downloads_manager_;
   FakeOfflinePageModel offline_pages_model_;
   StrictMock<MockContentSuggestionsProviderObserver> observer_;
-  CategoryFactory category_factory_;
   std::unique_ptr<TestingPrefServiceSimple> pref_service_;
   // Last so that the dependencies are deleted after the provider.
   std::unique_ptr<DownloadSuggestionsProvider> provider_;
 
   DISALLOW_COPY_AND_ASSIGN(DownloadSuggestionsProviderTest);
 };
 
 TEST_F(DownloadSuggestionsProviderTest,
        ShouldConvertOfflinePagesToSuggestions) {
   IgnoreOnCategoryStatusChangedToAvailable();
@@ skipping 660 matching lines @@
   EXPECT_THAT(GetDismissedSuggestions(), SizeIs(kMaxDismissedIdCount));
   DestroyProvider();
   // The oldest dismissed suggestion must become undismissed now. This is a
   // temporary workaround and not what we want in long term. This test must be
   // removed once we start pruning dismissed asset downloads on startup.
   EXPECT_CALL(*observer(),
               OnNewSuggestions(_, downloads_category(),
                                ElementsAre(HasUrl("http://download.com/0"))));
   CreateProvider(/*show_assets=*/true, /*show_offline_pages=*/false);
 }