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

components/ntp_snippets/offline_pages/recent_tab_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 "components/ntp_snippets/offline_pages/recent_tab_suggestions_provider.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/time/time.h"
 #include "components/ntp_snippets/category.h"
-#include "components/ntp_snippets/category_factory.h"
 #include "components/ntp_snippets/content_suggestions_provider.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/offline_pages/core/offline_page_item.h"
 #include "components/offline_pages/core/stub_offline_page_model.h"
 #include "components/prefs/testing_pref_service.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ skipping 35 matching lines @@
 
 }  // namespace
 
 class RecentTabSuggestionsProviderTest : public testing::Test {
  public:
   RecentTabSuggestionsProviderTest()
       : pref_service_(new TestingPrefServiceSimple()) {
     RecentTabSuggestionsProvider::RegisterProfilePrefs(
         pref_service()->registry());
 
-    provider_.reset(new RecentTabSuggestionsProvider(
-        &observer_, &category_factory_, &model_, pref_service()));
+    provider_.reset(
+        new RecentTabSuggestionsProvider(&observer_, &model_, pref_service()));
   }
 
   Category recent_tabs_category() {
-    return category_factory_.FromKnownCategory(KnownCategories::RECENT_TABS);
+    return Category::FromKnownCategory(KnownCategories::RECENT_TABS);
   }
 
   ContentSuggestion::ID GetDummySuggestionId(int id) {
     return ContentSuggestion::ID(recent_tabs_category(), base::IntToString(id));
   }
 
   void AddOfflinePageToModel(const OfflinePageItem& item) {
     model_.mutable_items()->push_back(item);
     provider_->OfflinePageAdded(&model_, item);
   }
@@ skipping 12 matching lines @@
   }
 
   RecentTabSuggestionsProvider* provider() { return provider_.get(); }
   FakeOfflinePageModel* model() { return &model_; }
   MockContentSuggestionsProviderObserver* observer() { return &observer_; }
   TestingPrefServiceSimple* pref_service() { return pref_service_.get(); }
 
  private:
   FakeOfflinePageModel model_;
   MockContentSuggestionsProviderObserver observer_;
-  CategoryFactory category_factory_;
   std::unique_ptr<TestingPrefServiceSimple> pref_service_;
   // Last so that the dependencies are deleted after the provider.
   std::unique_ptr<RecentTabSuggestionsProvider> provider_;
 
   DISALLOW_COPY_AND_ASSIGN(RecentTabSuggestionsProviderTest);
 };
 
 TEST_F(RecentTabSuggestionsProviderTest, ShouldConvertToSuggestions) {
   auto recent_tabs_list = CreateDummyRecentTabs({1, 2});
   EXPECT_CALL(*observer(), OnNewSuggestions(_, _, _)).Times(2);
@@ skipping 182 matching lines @@
               OnNewSuggestions(
                   _, recent_tabs_category(),
                   UnorderedElementsAre(
                       Property(&ContentSuggestion::publish_date, now),
                       Property(&ContentSuggestion::publish_date, tomorrow))));
 
   AddOfflinePageToModel(offline_pages[2]);
 }
 
 }  // namespace ntp_snippets