Remove --omnibox-popup-count flag.

chrome/browser/autocomplete/search_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/search_provider.h"
 
 #include <algorithm>
 
 #include "app/l10n_util.h"
 #include "base/callback.h"
@@ skipping 310 matching lines @@
   have_suggest_results_ = false;
 }
 
 void SearchProvider::ScheduleHistoryQuery(TemplateURL::IDType search_id,
                                           const std::wstring& text) {
   DCHECK(!text.empty());
   HistoryService* const history_service =
       profile_->GetHistoryService(Profile::EXPLICIT_ACCESS);
   HistoryService::Handle request_handle =
       history_service->GetMostRecentKeywordSearchTerms(
-          search_id, text, static_cast<int>(max_matches()),
+          search_id, text, static_cast<int>(kMaxMatches),
           &history_request_consumer_,
           NewCallback(this,
                       &SearchProvider::OnGotMostRecentKeywordSearchTerms));
   history_request_consumer_.SetClientData(history_service, request_handle,
                                           search_id);
   history_request_pending_ = true;
 }
 
 void SearchProvider::OnGotMostRecentKeywordSearchTerms(
     CancelableRequestProvider::Handle handle,
@@ skipping 91 matching lines @@
 
     Value* type_val;
     std::wstring type_str;
     if (type_list && type_list->Get(i, &type_val) &&
         type_val->GetAsString(&type_str) && (type_str == L"NAVIGATION")) {
       Value* site_val;
       std::wstring site_name;
       NavigationResults& navigation_results =
           is_keyword ? keyword_navigation_results_ :
                        default_navigation_results_;
-      if ((navigation_results.size() < max_matches()) &&
+      if ((navigation_results.size() < kMaxMatches) &&
           description_list && description_list->Get(i, &site_val) &&
           site_val->IsType(Value::TYPE_STRING) &&
           site_val->GetAsString(&site_name)) {
         // We can't blindly trust the URL coming from the server to be valid.
         GURL result_url =
             GURL(URLFixerUpper::FixupURL(WideToUTF8(suggestion_str),
                                          std::string()));
         if (result_url.is_valid())
           navigation_results.push_back(NavigationResult(result_url, site_name));
       }
     } else {
       // TODO(kochi): Currently we treat a calculator result as a query, but it
       // is better to have better presentation for caluculator results.
-      if (suggest_results->size() < max_matches())
+      if (suggest_results->size() < kMaxMatches)
         suggest_results->push_back(suggestion_str);
     }
   }
 
   return true;
 }
 
 void SearchProvider::ConvertResultsToAutocompleteMatches() {
   // Convert all the results to matches and add them to a map, so we can keep
   // the most relevant match for each result.
@@ skipping 24 matching lines @@
                          did_not_accept_default_suggestion, &map);
 
   // Now add the most relevant matches from the map to |matches_|.
   matches_.clear();
   for (MatchMap::const_iterator i(map.begin()); i != map.end(); ++i)
     matches_.push_back(i->second);
 
   AddNavigationResultsToMatches(keyword_navigation_results_, true);
   AddNavigationResultsToMatches(default_navigation_results_, false);
 
-  const size_t max_total_matches = max_matches() + 1;  // 1 for "what you typed"
+  const size_t max_total_matches = kMaxMatches + 1;  // 1 for "what you typed"
   std::partial_sort(matches_.begin(),
       matches_.begin() + std::min(max_total_matches, matches_.size()),
       matches_.end(), &AutocompleteMatch::MoreRelevant);
   if (matches_.size() > max_total_matches)
     matches_.erase(matches_.begin() + max_total_matches, matches_.end());
 
   UpdateStarredStateOfMatches();
 
   // We're done when both asynchronous subcomponents have finished.  We can't
   // use CancelableRequestConsumer.HasPendingRequests() for history requests
@@ skipping 240 matching lines @@
   // values preserve that property.  Otherwise, if the user starts editing a
   // suggestion, non-Search results will suddenly appear.
   if (input_.type() == AutocompleteInput::FORCED_QUERY)
     match.fill_into_edit.assign(L"?");
   match.fill_into_edit.append(match.contents);
   // TODO(pkasting): http://b/1112879 These should perhaps be
   // inline-autocompletable?
 
   return match;
 }