Prepare HistoryProvider for componentization

chrome/browser/autocomplete/history_url_provider.cc

 // Copyright (c) 2012 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/autocomplete/history_url_provider.h"
 
 #include <algorithm>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/message_loop/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.h"
 #include "chrome/browser/autocomplete/scored_history_match.h"
-#include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/search_engines/ui_thread_search_terms_data.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "components/bookmarks/browser/bookmark_utils.h"
 #include "components/history/core/browser/history_backend.h"
 #include "components/history/core/browser/history_database.h"
 #include "components/history/core/browser/history_service.h"
@@ skipping 433 matching lines @@
       promote_type(NEITHER),
       languages(languages),
       default_search_provider(default_search_provider ?
           new TemplateURL(default_search_provider->data()) : NULL),
       search_terms_data(new SearchTermsDataSnapshot(search_terms_data)) {
 }
 
 HistoryURLProviderParams::~HistoryURLProviderParams() {
 }
 
-HistoryURLProvider::HistoryURLProvider(AutocompleteProviderListener* listener,
+HistoryURLProvider::HistoryURLProvider(AutocompleteProviderClient* client,
+                                       AutocompleteProviderListener* listener,
                                        Profile* profile)
-    : HistoryProvider(profile, AutocompleteProvider::TYPE_HISTORY_URL),
+    : HistoryProvider(AutocompleteProvider::TYPE_HISTORY_URL, client),
+      profile_(profile),
       listener_(listener),
       params_(NULL) {
   // Initialize HUP scoring params based on the current experiment.
   OmniboxFieldTrial::GetExperimentalHUPScoringParams(&scoring_params_);
 }
 
 void HistoryURLProvider::Start(const AutocompleteInput& input,
                                bool minimal_changes,
                                bool called_due_to_focus) {
   // NOTE: We could try hard to do less work in the |minimal_changes| case
@@ skipping 32 matching lines @@
   what_you_typed_match.relevance = CalculateRelevance(WHAT_YOU_TYPED, 0);
 
   // Add the WYT match as a fallback in case we can't get the history service or
   // URL DB; otherwise, we'll replace this match lower down.  Don't do this for
   // queries, though -- while we can sometimes mark up a match for them, it's
   // not what the user wants, and just adds noise.
   if (fixed_up_input.type() != metrics::OmniboxInputType::QUERY)
     matches_.push_back(what_you_typed_match);
 
   // We'll need the history service to run both passes, so try to obtain it.
-  if (!profile_)
+  if (!client())

[Peter Kasting, 2015/06/16 00:03:42]

Can this ever be null?

[blundell, 2015/06/16 07:21:25]

No. Removed.

     return;
-  history::HistoryService* const history_service =
-      HistoryServiceFactory::GetForProfile(profile_,
-                                           ServiceAccessType::EXPLICIT_ACCESS);
+  history::HistoryService* const history_service = client()->HistoryService();
   if (!history_service)
     return;
 
   // Get the default search provider and search terms data now since we have to
   // retrieve these on the UI thread, and the second pass runs on the history
   // thread. |template_url_service| can be NULL when testing.
   TemplateURLService* template_url_service =
       TemplateURLServiceFactory::GetForProfile(profile_);
   TemplateURL* default_search_provider = template_url_service ?
       template_url_service->GetDefaultSearchProvider() : NULL;
@@ skipping 635 matching lines @@
     AutocompleteMatch::ClassifyLocationInString(base::string16::npos, 0,
         match.contents.length(), ACMatchClassification::URL,
         &match.contents_class);
   }
   match.description = info.title();
   match.description_class =
       ClassifyDescription(params.input.text(), match.description);
   RecordAdditionalInfoFromUrlRow(info, &match);
   return match;
 }