Remove --omnibox-popup-count flag.

chrome/browser/autocomplete/autocomplete.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/autocomplete.h"
 
 #include <algorithm>
 
 #include "app/l10n_util.h"
 #include "base/basictypes.h"
@@ skipping 529 matching lines @@
     DCHECK(i->offset > last_offset) << "Classification unsorted";
     DCHECK(i->offset < text.length()) << "Classification out of bounds";
     last_offset = i->offset;
   }
 }
 #endif
 
 // AutocompleteProvider -------------------------------------------------------
 
 // static
-size_t AutocompleteProvider::max_matches_ = 3;
+const size_t AutocompleteProvider::kMaxMatches = 3;
 
 AutocompleteProvider::~AutocompleteProvider() {
   Stop();
 }
 
 void AutocompleteProvider::SetProfile(Profile* profile) {
   DCHECK(profile);
   DCHECK(done_);  // The controller should have already stopped us.
   profile_ = profile;
 }
@@ skipping 40 matching lines @@
       profile_->GetPrefs()->GetString(prefs::kAcceptLanguages) : std::wstring();
   const net::FormatUrlTypes format_types = trim_http ?
       net::kFormatUrlOmitAll : net::kFormatUrlOmitUsernamePassword;
   return net::FormatUrl(url, languages, format_types, UnescapeRule::SPACES,
                         NULL, NULL, NULL);
 }
 
 // AutocompleteResult ---------------------------------------------------------
 
 // static
-size_t AutocompleteResult::max_matches_ = 6;
+const size_t AutocompleteResult::kMaxMatches = 6;
 
 void AutocompleteResult::Selection::Clear() {
   destination_url = GURL();
   provider_affinity = NULL;
   is_history_what_you_typed_match = false;
 }
 
 AutocompleteResult::AutocompleteResult() {
   // Reserve space for the max number of matches we'll show. The +1 accounts
   // for the history shortcut match as it isn't included in max_matches.
-  matches_.reserve(max_matches() + 1);
+  matches_.reserve(kMaxMatches + 1);
 
   // It's probably safe to do this in the initializer list, but there's little
   // penalty to doing it here and it ensures our object is fully constructed
   // before calling member functions.
   default_match_ = end();
 }
 
 void AutocompleteResult::CopyFrom(const AutocompleteResult& rhs) {
   if (this == &rhs)
     return;
@@ skipping 27 matching lines @@
 
 void AutocompleteResult::SortAndCull(const AutocompleteInput& input) {
   // Remove duplicates.
   std::sort(matches_.begin(), matches_.end(),
             &AutocompleteMatch::DestinationSortFunc);
   matches_.erase(std::unique(matches_.begin(), matches_.end(),
                              &AutocompleteMatch::DestinationsEqual),
                  matches_.end());
 
   // Find the top max_matches.
-  if (matches_.size() > max_matches()) {
-    std::partial_sort(matches_.begin(), matches_.begin() + max_matches(),
+  if (matches_.size() > kMaxMatches) {
+    std::partial_sort(matches_.begin(), matches_.begin() + kMaxMatches,
                       matches_.end(), &AutocompleteMatch::MoreRelevant);
-    matches_.erase(matches_.begin() + max_matches(), matches_.end());
+    matches_.erase(matches_.begin() + kMaxMatches, matches_.end());
   }
 
   // HistoryContentsProvider uses a negative relevance as a way to avoid
   // starving out other provider matches, yet we may end up using this match. To
   // make sure such matches are sorted correctly we search for all
   // relevances < 0 and negate them. If we change our relevance algorithm to
   // properly mix different providers' matches, this can go away.
   for (ACMatches::iterator i = matches_.begin(); i != matches_.end(); ++i) {
     if (i->relevance < 0)
       i->relevance = -i->relevance;
@@ skipping 336 matching lines @@
 void AutocompleteController::CheckIfDone() {
   for (ACProviders::const_iterator i(providers_.begin()); i != providers_.end();
        ++i) {
     if (!(*i)->done()) {
       done_ = false;
       return;
     }
   }
   done_ = true;
 }