Remove --omnibox-popup-count flag.

chrome/browser/autocomplete/history_url_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_url_provider.h"
 
 #include <algorithm>
 
 #include "base/basictypes.h"
 #include "base/histogram.h"
@@ skipping 134 matching lines @@
                                                            params->trim_http));
 
   // Get the matching URLs from the DB
   typedef std::vector<history::URLRow> URLRowVector;
   URLRowVector url_matches;
   HistoryMatches history_matches;
   for (Prefixes::const_iterator i(prefixes_.begin()); i != prefixes_.end();
        ++i) {
     if (params->cancel)
       return;  // Canceled in the middle of a query, give up.
-    // We only need max_matches results in the end, but before we get there we
+    // We only need kMaxMatches results in the end, but before we get there we
     // need to promote lower-quality matches that are prefixes of
     // higher-quality matches, and remove lower-quality redirects.  So we ask
     // for more results than we need, of every prefix type, in hopes this will
     // give us far more than enough to work with.  CullRedirects() will then
-    // reduce the list to the best max_matches results.
+    // reduce the list to the best kMaxMatches results.
     db->AutocompleteForPrefix(i->prefix + params->input.text(),
-                              max_matches() * 2, &url_matches);
+                              kMaxMatches * 2, &url_matches);
     for (URLRowVector::const_iterator j(url_matches.begin());
          j != url_matches.end(); ++j) {
       const Prefix* best_prefix = BestPrefix(j->url(), std::wstring());
       DCHECK(best_prefix != NULL);
       history_matches.push_back(HistoryMatch(*j, i->prefix.length(),
           !i->num_components,
           i->num_components >= best_prefix->num_components));
     }
   }
 
@@ skipping 25 matching lines @@
     first_match = 0;
     if (have_what_you_typed_match)
       params->matches.push_back(what_you_typed_match);
   }
 
   // This is the end of the synchronous pass.
   if (!backend)
     return;
 
   // Remove redirects and trim list to size.  We want to provide up to
-  // max_matches results plus the What You Typed result, if it was added to
+  // kMaxMatches results plus the What You Typed result, if it was added to
   // |history_matches| above.
-  CullRedirects(backend, &history_matches, max_matches() + exact_suggestion);
+  CullRedirects(backend, &history_matches, kMaxMatches + exact_suggestion);
 
   // Convert the history matches to autocomplete matches.
   for (size_t i = first_match; i < history_matches.size(); ++i) {
     const HistoryMatch& match = history_matches[i];
     DCHECK(!have_what_you_typed_match ||
            (match.url_info.url() !=
             GURL(params->matches.front().destination_url)));
     params->matches.push_back(HistoryMatchToACMatch(params, match, NORMAL,
         history_matches.size() - 1 - i));
   }
@@ skipping 639 matching lines @@
         match.contents.length(), ACMatchClassification::URL,
         &match.contents_class);
   }
   match.description = info.title();
   AutocompleteMatch::ClassifyMatchInString(params->input.text(), info.title(),
                                            ACMatchClassification::NONE,
                                            &match.description_class);
 
   return match;
 }