Fix a DCHECK failure in AutocompleteEditModel::OnPopupDataChanged()

chrome/browser/autocomplete/autocomplete_popup_model.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_POPUP_MODEL_H_
 #define CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_POPUP_MODEL_H_
 #pragma once
 
 #include "base/scoped_ptr.h"
 #include "chrome/browser/autocomplete/autocomplete.h"
@@ skipping 53 matching lines @@
   size_t selected_line() const {
     return selected_line_;
   }
 
   // Call to change the selected line.  This will update all state and repaint
   // the necessary parts of the window, as well as updating the edit with the
   // new temporary text.  |line| will be clamped to the range of valid lines.
   // |reset_to_default| is true when the selection is being reset back to the
   // default match, and thus there is no temporary text (and no
   // |manually_selected_match_|).
+  // If |force| is true then the selected line will be updated forcibly even if

[Peter Kasting, 2011/01/25 21:18:24]

Nit: No need for a linebreak before this line.

[James Su, 2011/01/25 21:47:03]

Done.

+  // the |line| is same as the current selected line.
   // NOTE: This assumes the popup is open, and thus both old and new values for
   // the selected line should not be kNoMatch.
-  void SetSelectedLine(size_t line, bool reset_to_default);
+  void SetSelectedLine(size_t line, bool reset_to_default, bool force);
 
   // Called when the user hits escape after arrowing around the popup.  This
   // will change the selected line back to the default match and redraw.
   void ResetToDefaultMatch();
 
   // Copies the selected match into |match|.  If an update is in progress,
   // "selected" means "default in the latest matches".  If there are no matches,
   // does not update |match|.
   //
   // If |alternate_nav_url| is non-NULL, it will be set to the alternate
@@ skipping 67 matching lines @@
   // which should only be true when the popup is closed.
   size_t selected_line_;
 
   // The match the user has manually chosen, if any.
   AutocompleteResult::Selection manually_selected_match_;
 
   DISALLOW_COPY_AND_ASSIGN(AutocompletePopupModel);
 };
 
 #endif  // CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_POPUP_MODEL_H_