Fix a browser crash involving omnibox extension keywords.

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 393 matching lines @@
       instant->DestroyPreviewContents();
   }
 
   autocomplete_controller_->Stop(true);
 }
 
 bool AutocompleteEditModel::CanPasteAndGo(const string16& text) const {
   if (!view_->GetCommandUpdater()->IsCommandEnabled(IDC_OPEN_CURRENT_URL))
     return false;
 
-  profile_->GetAutocompleteClassifier()->Classify(text, string16(), false,
-      &paste_and_go_match_, &paste_and_go_alternate_nav_url_);
+  profile_->GetAutocompleteClassifier()->Classify(text, string16(),
+      false, false, &paste_and_go_match_, &paste_and_go_alternate_nav_url_);
   return paste_and_go_match_.destination_url.is_valid();
 }
 
 void AutocompleteEditModel::PasteAndGo() {
   // The final parameter to OpenURL, keyword, is not quite correct here: it's
   // possible to "paste and go" a string that contains a keyword.  This is
   // enough of an edge case that we ignore this possibility.
   view_->RevertAll();
   view_->OpenMatch(paste_and_go_match_, CURRENT_TAB,
       paste_and_go_alternate_nav_url_, AutocompletePopupModel::kNoMatch,
@@ skipping 501 matching lines @@
     *alternate_nav_url = result.alternate_nav_url();
 }
 
 void AutocompleteEditModel::GetInfoForCurrentText(
     AutocompleteMatch* match,
     GURL* alternate_nav_url) const {
   if (popup_->IsOpen() || query_in_progress()) {
     InfoForCurrentSelection(match, alternate_nav_url);
   } else {
     profile_->GetAutocompleteClassifier()->Classify(
-        UserTextFromDisplayText(view_->GetText()), GetDesiredTLD(), true,
-        match, alternate_nav_url);
+        UserTextFromDisplayText(view_->GetText()), GetDesiredTLD(),
+        KeywordIsSelected(), true, match, alternate_nav_url);
   }
 }
 
 bool AutocompleteEditModel::GetURLForText(const string16& text,
                                           GURL* url) const {
   GURL parsed_url;
   const AutocompleteInput::Type type = AutocompleteInput::Parse(
       UserTextFromDisplayText(text), string16(), NULL, NULL, &parsed_url);
   if (type != AutocompleteInput::URL)
     return false;
@@ skipping 57 matching lines @@
 //  static
 bool AutocompleteEditModel::IsSpaceCharForAcceptingKeyword(wchar_t c) {
   switch (c) {
     case 0x0020:  // Space
     case 0x3000:  // Ideographic Space
       return true;
     default:
       return false;
   }
 }