Removes the link in the omnibox for searching history.

chrome/browser/autocomplete/history_contents_provider.cc

 // Copyright (c) 2010 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_contents_provider.h"
 
 #include "base/callback.h"
 #include "base/metrics/histogram.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
@@ skipping 115 matching lines @@
   ConvertResults();
 
   if (!input.synchronous_only()) {
     HistoryService* history =
         profile_->GetHistoryService(Profile::EXPLICIT_ACCESS);
     if (history) {
       done_ = false;
 
       history::QueryOptions options;
       options.SetRecentDayRange(kDaysToSearch);
-      options.max_count = kMaxMatchCount;
+      options.max_count = kMaxMatches;
       history->QueryHistory(WideToUTF16(input.text()), options,
           &request_consumer_,
           NewCallback(this, &HistoryContentsProvider::QueryComplete));
     }
   }
 }
 
 void HistoryContentsProvider::Stop() {
   done_ = true;
   request_consumer_.CancelAllRequests();
@@ skipping 29 matching lines @@
 
   // Results are sorted in decreasing order so we run the loop backwards so that
   // the relevance increment favors the higher ranked results.
   for (std::vector<history::URLResult*>::const_reverse_iterator i =
        results_.rbegin(); i != results_.rend(); ++i) {
     history::URLResult* result = *i;
     MatchReference ref(result, CalculateRelevance(*result));
     result_refs.push_back(ref);
   }
 
-  // Get the top matches and add them. Always do max number of matches the popup
-  // will show plus one. This ensures that if the other providers provide the
-  // exact same set of results, and the db only has max_matches + 1 results
-  // available for this query, we know the last one.
-  //
-  // This is done to avoid having the history search shortcut show
-  // 'See 1 previously viewed ...'.
-  //
-  // Note that AutocompleteResult::kMaxMatches (maximum size of the popup)
-  // is different than both kMaxMatches (the provider's maximum) and
-  // kMaxMatchCount (the number of items we want from the history).
-  size_t max_for_popup = std::min(AutocompleteResult::kMaxMatches + 1,
-                                  result_refs.size());
+  // Get the top matches and add them.
   size_t max_for_provider = std::min(kMaxMatches, result_refs.size());
-  std::partial_sort(result_refs.begin(), result_refs.begin() + max_for_popup,
+  std::partial_sort(result_refs.begin(), result_refs.begin() + max_for_provider,
                     result_refs.end(), &CompareMatchRelevance);
   matches_.clear();
-  for (size_t i = 0; i < max_for_popup; i++) {
+  for (size_t i = 0; i < max_for_provider; i++) {
     matches_.push_back(ResultToMatch(*result_refs[i].result,
                                      result_refs[i].relevance));
   }
-
-  // We made more matches than the autocomplete service requested for this
-  // provider (see previous comment). We invert the weights for the items
-  // we want to get removed, but preserve their magnitude which will be used
-  // to fill them in with our other results.
-  for (size_t i = max_for_provider; i < max_for_popup; i++)
-      matches_[i].relevance = -matches_[i].relevance;
 }
 
 static bool MatchInTitle(const history::URLResult& result) {
   return !result.title_match_positions().empty();
 }
 
 AutocompleteMatch HistoryContentsProvider::ResultToMatch(
     const history::URLResult& result,
     int score) {
   // TODO(sky): if matched title highlight matching words in title.
@@ skipping 67 matching lines @@
   UMA_HISTOGRAM_TIMES("Omnibox.QueryBookmarksTime",
                       TimeTicks::Now() - start_time);
 }
 
 void HistoryContentsProvider::AddBookmarkTitleMatchToResults(
     const bookmark_utils::TitleMatch& match) {
   history::URLResult url_result(match.node->GetURL(), match.match_positions);
   url_result.set_title(match.node->GetTitle());
   results_.AppendURLBySwapping(&url_result);
 }