Remove --omnibox-popup-count flag.

chrome/browser/autocomplete/autocomplete.h

 // 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.
 
 #ifndef CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_H_
 #define CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 520 matching lines @@
   // Returns the name of this provider.
   const char* name() const { return name_; }
 
   // Called to delete a match and the backing data that produced it.  This
   // match should not appear again in this or future queries.  This can only be
   // called for matches the provider marks as deletable.  This should only be
   // called when no query is running.
   // NOTE: Remember to call OnProviderUpdate() if matches_ is updated.
   virtual void DeleteMatch(const AutocompleteMatch& match) {}
 
-  static void set_max_matches(size_t max_matches) {
-    max_matches_ = max_matches;
-  }
-
-  static size_t max_matches() { return max_matches_; }
+  // A suggested upper bound for how many matches a provider should return.
+  // TODO(pkasting): http://b/1111299 , http://b/933133 This should go away once
+  // we have good relevance heuristics; the controller should handle all
+  // culling.
+  static const size_t kMaxMatches;
 
  protected:
   friend class base::RefCountedThreadSafe<AutocompleteProvider>;
 
   virtual ~AutocompleteProvider();
 
   // Trims "http:" and up to two subsequent slashes from |url|.  Returns the
   // number of characters that were trimmed.
   static size_t TrimHttpPrefix(std::wstring* url);
 
@@ skipping 13 matching lines @@
   Profile* profile_;
 
   ACProviderListener* listener_;
   ACMatches matches_;
   bool done_;
 
   // The name of this provider.  Used for logging.
   const char* name_;
 
  private:
-  // A suggested upper bound for how many matches a provider should return.
-  // TODO(pkasting): http://b/1111299 , http://b/933133 This should go away once
-  // we have good relevance heuristics; the controller should handle all
-  // culling.
-  static size_t max_matches_;
-
-  DISALLOW_EVIL_CONSTRUCTORS(AutocompleteProvider);
+  DISALLOW_COPY_AND_ASSIGN(AutocompleteProvider);
 };
 
 typedef AutocompleteProvider::ACProviderListener ACProviderListener;
 
 // AutocompleteResult ---------------------------------------------------------
 
 // All matches from all providers for a particular query.  This also tracks
 // what the default match should be if the user doesn't manually select another
 // match.
 class AutocompleteResult {
@@ skipping 25 matching lines @@
     // |destination_url|, we'll use the best match from this provider.
     const AutocompleteProvider* provider_affinity;
 
     // True when this is the HistoryURLProvider's "what you typed" match.  This
     // can't be tracked using |destination_url| because its URL changes on every
     // keystroke, so if this is set, we'll preserve the selection by simply
     // choosing the new "what you typed" entry and ignoring |destination_url|.
     bool is_history_what_you_typed_match;
   };
 
-  static void set_max_matches(size_t max_matches) {
-    max_matches_ = max_matches;
-  }
-  static size_t max_matches() { return max_matches_; }
-
   AutocompleteResult();
 
   // operator=() by another name.
   void CopyFrom(const AutocompleteResult& rhs);
 
   // Adds a single match. The match is inserted at the appropriate position
   // based on relevancy and display order. This is ONLY for use after
   // SortAndCull() has been invoked, and preserves default_match_.
   void AddMatch(const AutocompleteMatch& match);
 
@@ skipping 29 matching lines @@
   void Reset() {
     matches_.clear();
     default_match_ = end();
   }
 
 #ifndef NDEBUG
   // Does a data integrity check on this result.
   void Validate() const;
 #endif
 
- private:
   // Max number of matches we'll show from the various providers. We may end
   // up showing an additional shortcut for Destinations->History, see
   // AddHistoryContentsShortcut.
-  static size_t max_matches_;
+  static const size_t kMaxMatches;
 
+ private:
   ACMatches matches_;
 
   const_iterator default_match_;
 
   // The "alternate navigation URL", if any, for this result set.  This is a URL
   // to try offering as a navigational option in case the user navigated to the
   // URL of the default match but intended something else.  For example, if the
   // user's local intranet contains site "foo", and the user types "foo", we
   // default to searching for "foo" when the user may have meant to navigate
   // there.  In cases like this, the default match will point to the "search for
   // 'foo'" result, and this will contain "http://foo/".
   GURL alternate_nav_url_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(AutocompleteResult);
+  DISALLOW_COPY_AND_ASSIGN(AutocompleteResult);
 };
 
 // AutocompleteController -----------------------------------------------------
 
 // The coordinator for autocomplete queries, responsible for combining the
 // matches from a series of providers into one AutocompleteResult.
 class AutocompleteController : public ACProviderListener {
  public:
   // Used to indicate an index that is not selected in a call to Update().
   static const int kNoItemSelected;
@@ skipping 143 matching lines @@
   // True if a query is not currently running.
   bool done_;
 
   // Timer that tracks how long it's been since the last time we sent our
   // observers a new result set.  This is used both to enforce a lower bound on
   // the delay between most commits (to reduce flicker), and ensure that updates
   // eventually get committed no matter what delays occur between them or how
   // fast or continuously the user is typing.
   base::RepeatingTimer<AutocompleteController> update_delay_timer_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(AutocompleteController);
+  DISALLOW_COPY_AND_ASSIGN(AutocompleteController);
 };
 
 // AutocompleteLog ------------------------------------------------------------
 
 // The data to log (via the metrics service) when the user selects an item
 // from the omnibox popup.
 struct AutocompleteLog {
   AutocompleteLog(std::wstring text,
                   AutocompleteInput::Type input_type,
                   size_t selected_index,
@@ skipping 11 matching lines @@
   AutocompleteInput::Type input_type;
   // Selected index (if selected) or -1 (AutocompletePopupModel::kNoMatch).
   size_t selected_index;
   // Inline autocompleted length (if displayed).
   size_t inline_autocompleted_length;
   // Result set.
   const AutocompleteResult& result;
 };
 
 #endif  // CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_H_