More CHECKs in my continuing effort to figure out what is going on. Neither Ben nor I can get this one.

BUG=13500
TEST=none
Review URL: http://codereview.chromium.org/140009

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18947 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 3 insertions, 2 deletions

diff --git a/chrome/browser/autocomplete/autocomplete_popup_model.cc b/chrome/browser/autocomplete/autocomplete_popup_model.cc
index e0e9ef0..d3a6fe6 100644
--- a/chrome/browser/autocomplete/autocomplete_popup_model.cc
+++ b/chrome/browser/autocomplete/autocomplete_popup_model.cc
@@ -95,7 +95,7 @@ void AutocompletePopupModel::SetHoveredLine(size_t line) {
 void AutocompletePopupModel::SetSelectedLine(size_t line,
                                              bool reset_to_default) {
   const AutocompleteResult& result = controller_->result();
-  DCHECK(line < result.size());
+  CHECK(line < result.size());
   if (result.empty())
     return;
 
@@ -142,7 +142,7 @@ void AutocompletePopupModel::SetSelectedLine(size_t line,
 
 void AutocompletePopupModel::ResetToDefaultMatch() {
   const AutocompleteResult& result = controller_->result();
-  DCHECK(!result.empty());
+  CHECK(!result.empty());
   SetSelectedLine(result.default_match() - result.begin(), true);
 }
 
diff --git a/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc b/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc
index 7dddf23..37be9f1 100644
--- a/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc
+++ b/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc
@@ -279,6 +279,7 @@ AutocompleteResultView::AutocompleteResultView(
       hot_(false),
       font_(font),
       mirroring_context_(new MirroringContext()) {
+  CHECK(model_index >= 0);
   InitClass();
 }