Remove ScoreHistoryMatch::Builder

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/command_line.h"
 #include "base/i18n/break_iterator.h"
 #include "base/logging.h"
 #include "base/metrics/field_trial.h"
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_number_conversions.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/history_url_provider.h"
 #include "chrome/browser/autocomplete/in_memory_url_index.h"
 #include "chrome/browser/autocomplete/in_memory_url_index_types.h"
-#include "chrome/browser/autocomplete/scored_history_match_builder_impl.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.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/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "components/bookmarks/browser/bookmark_model.h"
 #include "components/history/core/browser/history_database.h"
 #include "components/history/core/browser/history_service.h"
 #include "components/metrics/proto/omnibox_input_type.pb.h"
 #include "components/omnibox/autocomplete_match_type.h"
 #include "components/omnibox/autocomplete_result.h"
 #include "components/omnibox/omnibox_field_trial.h"
 #include "components/search_engines/template_url.h"
 #include "components/search_engines/template_url_service.h"
 #include "content/public/browser/notification_source.h"
 #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/url_parse.h"
 #include "url/url_util.h"
 
-namespace {
-
-// Returns whether |url| is bookmarked in |bookmark_model| (which can be null
-// during testing). Used for ScoredHistoryMatchBuilderImpl.
-bool IsBookmarked(bookmarks::BookmarkModel* bookmark_model, const GURL& url) {
-  return bookmark_model && bookmark_model->IsBookmarked(url);
-}
-
-}  // namespace
-
 bool HistoryQuickProvider::disabled_ = false;
 
 HistoryQuickProvider::HistoryQuickProvider(
     Profile* profile,
     InMemoryURLIndex* in_memory_url_index)
     : HistoryProvider(profile, AutocompleteProvider::TYPE_HISTORY_QUICK),
       languages_(profile_->GetPrefs()->GetString(prefs::kAcceptLanguages)),
       in_memory_url_index_(in_memory_url_index) {
 }
 
@@ skipping 21 matching lines @@
       base::TimeTicks end_time = base::TimeTicks::Now();
       std::string name = "HistoryQuickProvider.QueryIndexTime." +
           base::IntToString(input.text().length());
       base::HistogramBase* counter = base::Histogram::FactoryGet(
           name, 1, 1000, 50, base::Histogram::kUmaTargetedHistogramFlag);
       counter->Add(static_cast<int>((end_time - start_time).InMilliseconds()));
     }
   }
 }
 
-HistoryQuickProvider::~HistoryQuickProvider() {}
+HistoryQuickProvider::~HistoryQuickProvider() {
+}
 
 void HistoryQuickProvider::DoAutocomplete() {
   // Get the matching URLs from the DB.
-  ScoredHistoryMatches matches;
-  {
-    ScoredHistoryMatchBuilderImpl builder(base::Bind(
-        &IsBookmarked,
-        base::Unretained(BookmarkModelFactory::GetForProfile(profile_))));
-    matches = in_memory_url_index_->HistoryItemsForTerms(
-        autocomplete_input_.text(), autocomplete_input_.cursor_position(),
-        AutocompleteProvider::kMaxMatches, builder);
-  }
+  ScoredHistoryMatches matches = in_memory_url_index_->HistoryItemsForTerms(
+      autocomplete_input_.text(), autocomplete_input_.cursor_position(),
+      AutocompleteProvider::kMaxMatches);
   if (matches.empty())
     return;
 
   // Figure out if HistoryURL provider has a URL-what-you-typed match
   // that ought to go first and what its score will be.
   bool will_have_url_what_you_typed_match_first = false;
   int url_what_you_typed_match_score = -1;  // undefined
   // These are necessary (but not sufficient) conditions for the omnibox
   // input to be a URL-what-you-typed match.  The username test checks that
   // either the username does not exist (a regular URL such as http://site/)
@@ skipping 173 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;
 }