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

components/ntp_snippets/remote/ntp_snippets_fetcher.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/remote/ntp_snippets_fetcher.h"
 
 #include <algorithm>
 #include <cstdlib>
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/json/json_writer.h"
 #include "base/memory/ptr_util.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/metrics/sparse_histogram.h"
 #include "base/path_service.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/default_tick_clock.h"
 #include "base/time/time.h"
 #include "base/values.h"
 #include "components/data_use_measurement/core/data_use_user_data.h"
-#include "components/ntp_snippets/category_factory.h"
+#include "components/ntp_snippets/category.h"
 #include "components/ntp_snippets/features.h"
 #include "components/ntp_snippets/ntp_snippets_constants.h"
 #include "components/ntp_snippets/user_classifier.h"
 #include "components/signin/core/browser/profile_oauth2_token_service.h"
 #include "components/signin/core/browser/signin_manager.h"
 #include "components/signin/core/browser/signin_manager_base.h"
 #include "components/variations/net/variations_http_headers.h"
 #include "components/variations/variations_associated_data.h"
 #include "grit/components_strings.h"
 #include "net/base/load_flags.h"
@@ skipping 352 matching lines @@
 
 NTPSnippetsFetcher::Params::Params() = default;
 NTPSnippetsFetcher::Params::Params(const Params&) = default;
 NTPSnippetsFetcher::Params::~Params() = default;
 
 NTPSnippetsFetcher::NTPSnippetsFetcher(
     SigninManagerBase* signin_manager,
     OAuth2TokenService* token_service,
     scoped_refptr<URLRequestContextGetter> url_request_context_getter,
     PrefService* pref_service,
-    CategoryFactory* category_factory,
     LanguageModel* language_model,
     const ParseJSONCallback& parse_json_callback,
     const std::string& api_key,
     const UserClassifier* user_classifier)
     : OAuth2TokenService::Consumer("ntp_snippets"),
       signin_manager_(signin_manager),
       token_service_(token_service),
       url_request_context_getter_(std::move(url_request_context_getter)),
-      category_factory_(category_factory),
       language_model_(language_model),
       parse_json_callback_(parse_json_callback),
       fetch_url_(GetFetchEndpoint()),
       fetch_api_(UsesChromeContentSuggestionsAPI(fetch_url_)
                      ? FetchAPI::CHROME_CONTENT_SUGGESTIONS_API
                      : FetchAPI::CHROME_READER_API),
       api_key_(api_key),
       tick_clock_(new base::DefaultTickClock()),
       user_classifier_(user_classifier),
       request_throttler_rare_ntp_user_(
@@ skipping 608 matching lines @@
                                         FetchedCategoriesVector* categories) {
   const base::DictionaryValue* top_dict = nullptr;
   if (!parsed.GetAsDictionary(&top_dict)) {
     return false;
   }
 
   switch (fetch_api_) {
     case FetchAPI::CHROME_READER_API: {
       const int kUnusedRemoteCategoryId = -1;
       categories->push_back(FetchedCategory(
-          category_factory_->FromKnownCategory(KnownCategories::ARTICLES),
+          Category::FromKnownCategory(KnownCategories::ARTICLES),
           BuildArticleCategoryInfo(base::nullopt)));
 
       const base::ListValue* recos = nullptr;
       return top_dict->GetList("recos", &recos) &&
              AddSnippetsFromListValue(/*content_suggestions_api=*/false,
                                       kUnusedRemoteCategoryId, *recos,
                                       &categories->back().snippets);
     }
 
     case FetchAPI::CHROME_CONTENT_SUGGESTIONS_API: {
@@ skipping 17 matching lines @@
         const base::ListValue* suggestions = nullptr;
         // Absence of a list of suggestions is treated as an empty list, which
         // is permissible.
         if (category_value->GetList("suggestions", &suggestions)) {
           if (!AddSnippetsFromListValue(
                   /*content_suggestions_api=*/true, remote_category_id,
                   *suggestions, &snippets)) {
             return false;
           }
         }
-        Category category =
-            category_factory_->FromRemoteCategory(remote_category_id);
+        Category category = Category::FromRemoteCategory(remote_category_id);
         if (category.IsKnownCategory(KnownCategories::ARTICLES)) {
           categories->push_back(FetchedCategory(
               category,
               BuildArticleCategoryInfo(base::UTF8ToUTF16(utf8_title))));
         } else {
           // TODO(tschumann): Right now, the backend does not yet populate this
           // field. Make it mandatory once the backends provide it.
           bool allow_fetching_more_results = false;
           category_value->GetBoolean("allowFetchingMoreResults",
                                      &allow_fetching_more_results);
@@ skipping 25 matching lines @@
   NOTREACHED();
   return false;
 }
 
 bool NTPSnippetsFetcher::NeedsAuthentication() const {
   return (personalization_ == Personalization::kPersonal ||
           personalization_ == Personalization::kBoth);
 }
 
 }  // namespace ntp_snippets