Prepare HistoryProvider for componentization

chrome/browser/autocomplete/history_quick_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_quick_provider.h"
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/debug/crash_logging.h"
@@ skipping 29 matching lines @@
 #include "content/public/browser/notification_types.h"
 #include "net/base/escape.h"
 #include "net/base/net_util.h"
 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
 #include "url/third_party/mozilla/url_parse.h"
 #include "url/url_util.h"
 
 bool HistoryQuickProvider::disabled_ = false;
 
 HistoryQuickProvider::HistoryQuickProvider(
+    scoped_ptr<AutocompleteProviderClient> client,
     Profile* profile,
     InMemoryURLIndex* in_memory_url_index)
-    : HistoryProvider(profile, AutocompleteProvider::TYPE_HISTORY_QUICK),
+    : HistoryProvider(client.Pass(), AutocompleteProvider::TYPE_HISTORY_QUICK),
+      profile_(profile),
       languages_(profile_->GetPrefs()->GetString(prefs::kAcceptLanguages)),
       in_memory_url_index_(in_memory_url_index) {
 }
 
 void HistoryQuickProvider::Start(const AutocompleteInput& input,
                                  bool minimal_changes,
                                  bool called_due_to_focus) {
   matches_.clear();
   if (disabled_ || called_due_to_focus)
     return;
@@ skipping 37 matching lines @@
   // provider won't promote the URL-what-you-typed match to first
   // for these inputs.
   const bool can_have_url_what_you_typed_match_first =
       (autocomplete_input_.type() != metrics::OmniboxInputType::QUERY) &&
       (!autocomplete_input_.parts().username.is_nonempty() ||
        autocomplete_input_.parts().password.is_nonempty() ||
        autocomplete_input_.parts().path.is_nonempty());
   if (can_have_url_what_you_typed_match_first) {
     history::HistoryService* const history_service =
         HistoryServiceFactory::GetForProfile(
             profile_, ServiceAccessType::EXPLICIT_ACCESS);

[Peter Kasting, 2015/06/12 16:20:23]

Seems like this ought to be using the client's HistoryService() method?

[blundell, 2015/06/15 08:51:33]

Done.

     // We expect HistoryService to be available.  In case it's not,
     // (e.g., due to Profile corruption) we let HistoryQuick provider
     // completions (which may be available because it's a different
     // data structure) compete with the URL-what-you-typed match as
     // normal.
     if (history_service) {
       history::URLDatabase* url_db = history_service->InMemoryDatabase();
       // url_db can be NULL if it hasn't finished initializing (or
       // failed to to initialize).  In this case, we let HistoryQuick
       // provider completions compete with the URL-what-you-typed
@@ skipping 155 matching lines @@
   match.description = info.title();
   match.description_class = SpansFromTermMatch(
       history_match.title_matches, match.description.length(), false);
 
   match.RecordAdditionalInfo("typed count", info.typed_count());
   match.RecordAdditionalInfo("visit count", info.visit_count());
   match.RecordAdditionalInfo("last visit", info.last_visit());
 
   return match;
 }