Remove ScoreHistoryMatch::Builder

chrome/browser/autocomplete/history_url_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_url_provider.h"
 
 #include <algorithm>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/message_loop/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_service.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/in_memory_url_index_types.h"
-#include "chrome/browser/autocomplete/scored_history_match_builder_impl.h"
+#include "chrome/browser/autocomplete/scored_history_match.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/browser/search_engines/ui_thread_search_terms_data.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "components/bookmarks/browser/bookmark_utils.h"
 #include "components/history/core/browser/history_backend.h"
 #include "components/history/core/browser/history_database.h"
@@ skipping 677 matching lines @@
   base::string16 clean_description =
       bookmarks::CleanUpTitleForMatching(description);
   TermMatches description_matches(SortAndDeoverlapMatches(
       MatchTermInString(input_text, clean_description, 0)));
   WordStarts description_word_starts;
   String16VectorFromString16(clean_description, false,
                              &description_word_starts);
   // If HistoryURL retrieves any matches (and hence we reach this code), we
   // are guaranteed that the beginning of input_text must be a word break.
   WordStarts offsets(1, 0u);
-  description_matches =
-      ScoredHistoryMatchBuilderImpl::FilterTermMatchesByWordStarts(
-          description_matches, offsets, description_word_starts, 0,
-          std::string::npos);
+  description_matches = ScoredHistoryMatch::FilterTermMatchesByWordStarts(
+      description_matches, offsets, description_word_starts, 0,
+      std::string::npos);
   return SpansFromTermMatch(
       description_matches, clean_description.length(), false);
 }
 
 void HistoryURLProvider::DoAutocomplete(history::HistoryBackend* backend,
                                         history::URLDatabase* db,
                                         HistoryURLProviderParams* params) {
   // Get the matching URLs from the DB.
   params->matches.clear();
   history::URLRows url_matches;
@@ skipping 422 matching lines @@
     AutocompleteMatch::ClassifyLocationInString(base::string16::npos, 0,
         match.contents.length(), ACMatchClassification::URL,
         &match.contents_class);
   }
   match.description = info.title();
   match.description_class =
       ClassifyDescription(params.input.text(), match.description);
   RecordAdditionalInfoFromUrlRow(info, &match);
   return match;
 }