Componentize ScoredHistoryMatch

chrome/browser/history/in_memory_url_index.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/history/in_memory_url_index.h"
 
 #include "base/files/file_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/trace_event/trace_event.h"
 #include "chrome/browser/history/history_service.h"
@@ skipping 63 matching lines @@
 }
 
 InMemoryURLIndex::RebuildPrivateDataFromHistoryDBTask::
     ~RebuildPrivateDataFromHistoryDBTask() {
 }
 
 // InMemoryURLIndex ------------------------------------------------------------
 
 InMemoryURLIndex::InMemoryURLIndex(HistoryService* history_service,
                                    const base::FilePath& history_dir,
-                                   const std::string& languages,
-                                   HistoryClient* history_client)
+                                   const std::string& languages)
     : history_service_(history_service),
-      history_client_(history_client),
       history_dir_(history_dir),
       languages_(languages),
       private_data_(new URLIndexPrivateData),
       restore_cache_observer_(NULL),
       save_cache_observer_(NULL),
       shutdown_(false),
       restored_(false),
       needs_to_be_cached_(false) {
   InitializeSchemeWhitelist(&scheme_whitelist_);
   // TODO(mrossetti): Register for language change notifications.
@@ skipping 37 matching lines @@
     return false;
   *file_path = history_dir_.Append(FILE_PATH_LITERAL("History Provider Cache"));
   return true;
 }
 
 // Querying --------------------------------------------------------------------
 
 ScoredHistoryMatches InMemoryURLIndex::HistoryItemsForTerms(
     const base::string16& term_string,
     size_t cursor_position,
-    size_t max_matches) {
-  return private_data_->HistoryItemsForTerms(
-      term_string,
-      cursor_position,
-      max_matches,
-      languages_,
-      history_client_);
+    size_t max_matches,
+    const ScoredHistoryMatch::Builder& builder) {
+  return private_data_->HistoryItemsForTerms(term_string, cursor_position,
+                                             max_matches, languages_, builder);
 }
 
 // Updating --------------------------------------------------------------------
 
 void InMemoryURLIndex::DeleteURL(const GURL& url) {
   private_data_->DeleteURL(url);
 }
 
 void InMemoryURLIndex::OnURLVisited(HistoryService* history_service,
                                     ui::PageTransition transition,
@@ skipping 162 matching lines @@
         base::Bind(DeleteCacheFile, path));
   }
 }
 
 void InMemoryURLIndex::OnCacheSaveDone(bool succeeded) {
   if (save_cache_observer_)
     save_cache_observer_->OnCacheSaveFinished(succeeded);
 }
 
 }  // namespace history