Componentize ScoredHistoryMatch

chrome/browser/history/history_service.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.
 
 // The history system runs on a background thread so that potentially slow
 // database operations don't delay the browser. This backend processing is
 // represented by HistoryBackend. The HistoryService's job is to dispatch to
 // that thread.
 //
 // Main thread                       History thread
@@ skipping 958 matching lines @@
     Cleanup();
     return false;
   }
 
   history_dir_ = history_database_params.history_dir;
   no_db_ = no_db;
 
   if (!languages.empty()) {
     // Do not create |in_memory_url_index_| when languages is empty (which
     // should only happens during testing).
-    in_memory_url_index_.reset(new history::InMemoryURLIndex(
-        this, history_dir_, languages, history_client_));
+    in_memory_url_index_.reset(
+        new history::InMemoryURLIndex(this, history_dir_, languages));
     in_memory_url_index_->Init();
   }
 
   // Create the history backend.
   scoped_refptr<HistoryBackend> backend(new HistoryBackend(
       history_dir_, new BackendDelegate(weak_ptr_factory_.GetWeakPtr(),
                                         base::ThreadTaskRunnerHandle::Get()),
       history_client_));
   history_backend_.swap(backend);
 
@@ skipping 285 matching lines @@
     const HistoryService::OnFaviconChangedCallback& callback) {
   DCHECK(thread_checker_.CalledOnValidThread());
   return favicon_changed_callback_list_.Add(callback);
 }
 
 void HistoryService::NotifyFaviconChanged(
     const std::set<GURL>& changed_favicons) {
   DCHECK(thread_checker_.CalledOnValidThread());
   favicon_changed_callback_list_.Notify(changed_favicons);
 }