Fix a CHECK failure in AutocompletePopupModel::InfoForCurrentSelection().

chrome/browser/autocomplete/autocomplete_edit.cc

 // Copyright (c) 2011 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_edit.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/metrics/histogram.h"
@@ skipping 461 matching lines @@
   NotificationService::current()->Notify(
       NotificationType::AUTOCOMPLETE_EDIT_FOCUSED,
       Source<AutocompleteEditModel>(this),
       NotificationService::NoDetails());
 }
 
 void AutocompleteEditModel::OnKillFocus() {
   has_focus_ = false;
   control_key_state_ = UP;
   paste_state_ = NONE;
-
-  // Like typing, killing focus "accepts" the temporary text as the user
-  // text, because it makes little sense to have temporary text when the
-  // popup is closed.
-  InternalSetUserText(UserTextFromDisplayText(view_->GetText()));
-  has_temporary_text_ = false;
 }
 
 bool AutocompleteEditModel::OnEscapeKeyPressed() {
   if (has_temporary_text_) {
     AutocompleteMatch match;
     popup_->InfoForCurrentSelection(&match, NULL);
     if (match.destination_url != original_url_) {
       // The user typed something, then selected a different item.  Restore the
       // text they typed and change back to the default item.
       // NOTE: This purposefully does not reset paste_state_.
@@ skipping 175 matching lines @@
   }
 
   view_->UpdatePopup();
   return true;
 }
 
 void AutocompleteEditModel::PopupBoundsChangedTo(const gfx::Rect& bounds) {
   controller_->OnPopupBoundsChanged(bounds);
 }
 
+void AutocompleteEditModel::OnPopupClosed() {
+  // Accepts the temporary text as the user text, because it makes little
+  // sense to have temporary text when the popup is closed.
+  InternalSetUserText(UserTextFromDisplayText(view_->GetText()));
+  has_temporary_text_ = false;
+}
+
 // Return true if the suggestion type warrants a TCP/IP preconnection.
 // i.e., it is now highly likely that the user will select the related domain.
 static bool IsPreconnectable(AutocompleteMatch::Type type) {
   UMA_HISTOGRAM_ENUMERATION("Autocomplete.MatchType", type,
                             AutocompleteMatch::NUM_TYPES);
   switch (type) {
     // Matches using the user's default search engine.
     case AutocompleteMatch::SEARCH_WHAT_YOU_TYPED:
     case AutocompleteMatch::SEARCH_HISTORY:
     case AutocompleteMatch::SEARCH_SUGGEST:
@@ skipping 100 matching lines @@
 //  static
 bool AutocompleteEditModel::IsSpaceCharForAcceptingKeyword(wchar_t c) {
   switch (c) {
     case 0x0020:  // Space
     case 0x3000:  // Ideographic Space
       return true;
     default:
       return false;
   }
 }