Remove ScoreHistoryMatch::Builder

chrome/browser/autocomplete/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/autocomplete/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/autocomplete/url_index_private_data.h"
@@ skipping 20 matching lines @@
   whitelist->insert(std::string(content::kChromeUIScheme));
   whitelist->insert(std::string(url::kFileScheme));
   whitelist->insert(std::string(url::kFtpScheme));
   whitelist->insert(std::string(url::kHttpScheme));
   whitelist->insert(std::string(url::kHttpsScheme));
   whitelist->insert(std::string(url::kMailToScheme));
 }
 
 // Restore/SaveCacheObserver ---------------------------------------------------
 
-InMemoryURLIndex::RestoreCacheObserver::~RestoreCacheObserver() {}
+InMemoryURLIndex::RestoreCacheObserver::~RestoreCacheObserver() {
+}
 
-InMemoryURLIndex::SaveCacheObserver::~SaveCacheObserver() {}
+InMemoryURLIndex::SaveCacheObserver::~SaveCacheObserver() {
+}
 
 // RebuildPrivateDataFromHistoryDBTask -----------------------------------------
 
 InMemoryURLIndex::RebuildPrivateDataFromHistoryDBTask::
     RebuildPrivateDataFromHistoryDBTask(
         InMemoryURLIndex* index,
         const std::string& languages,
         const std::set<std::string>& scheme_whitelist)
     : index_(index),
       languages_(languages),
@@ skipping 16 matching lines @@
     DoneRunOnMainThread() {
   index_->DoneRebuidingPrivateDataFromHistoryDB(succeeded_, data_);
 }
 
 InMemoryURLIndex::RebuildPrivateDataFromHistoryDBTask::
     ~RebuildPrivateDataFromHistoryDBTask() {
 }
 
 // InMemoryURLIndex ------------------------------------------------------------
 
-InMemoryURLIndex::InMemoryURLIndex(history::HistoryService* history_service,
+InMemoryURLIndex::InMemoryURLIndex(bookmarks::BookmarkModel* bookmark_model,
+                                   history::HistoryService* history_service,
                                    const base::FilePath& history_dir,
                                    const std::string& languages)
-    : history_service_(history_service),
+    : bookmark_model_(bookmark_model),
+      history_service_(history_service),
       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),
       listen_to_history_service_loaded_(false) {
   InitializeSchemeWhitelist(&scheme_whitelist_);
@@ skipping 23 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,
-    const ScoredHistoryMatch::Builder& builder) {
-  return private_data_->HistoryItemsForTerms(term_string, cursor_position,
-                                             max_matches, languages_, builder);
+    size_t max_matches) {
+  return private_data_->HistoryItemsForTerms(
+      term_string, cursor_position, max_matches, languages_, bookmark_model_);
 }
 
 // Updating --------------------------------------------------------------------
 
 void InMemoryURLIndex::DeleteURL(const GURL& url) {
   private_data_->DeleteURL(url);
 }
 
 void InMemoryURLIndex::OnURLVisited(history::HistoryService* history_service,
                                     ui::PageTransition transition,
@@ skipping 183 matching lines @@
     content::BrowserThread::PostBlockingPoolTask(
         FROM_HERE,
         base::Bind(DeleteCacheFile, path));
   }
 }
 
 void InMemoryURLIndex::OnCacheSaveDone(bool succeeded) {
   if (save_cache_observer_)
     save_cache_observer_->OnCacheSaveFinished(succeeded);
 }