Remove --omnibox-popup-count flag.

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/histogram.h"
 #include "base/string_util.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
@@ skipping 156 matching lines @@
   }
 
   // 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::max_matches() (maximum size of the popup)
-  // is different than both max_matches (the provider's maximum) and
+  // 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::max_matches() + 1,
+  size_t max_for_popup = std::min(AutocompleteResult::kMaxMatches + 1,
                                   result_refs.size());
-  size_t max_for_provider = std::min(max_matches(), result_refs.size());
+  size_t max_for_provider = std::min(kMaxMatches, result_refs.size());
   std::partial_sort(result_refs.begin(), result_refs.begin() + max_for_popup,
                     result_refs.end(), &CompareMatchRelevance);
   matches_.clear();
   for (size_t i = 0; i < max_for_popup; 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
@@ skipping 65 matching lines @@
 
 void HistoryContentsProvider::QueryBookmarks(const AutocompleteInput& input) {
   BookmarkModel* bookmark_model = profile_->GetBookmarkModel();
   if (!bookmark_model)
     return;
 
   DCHECK(results_.empty());
 
   TimeTicks start_time = TimeTicks::Now();
   std::vector<bookmark_utils::TitleMatch> matches;
-  bookmark_model->GetBookmarksWithTitlesMatching(input.text(), max_matches(),
+  bookmark_model->GetBookmarksWithTitlesMatching(input.text(), kMaxMatches,
                                                  &matches);
   for (size_t i = 0; i < matches.size(); ++i)
     AddBookmarkTitleMatchToResults(matches[i]);
   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);
 }