Omnibox enters keyword search mode incorrectly

chrome/browser/autocomplete/autocomplete_popup_model.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_popup_model.h"
 
 #include <algorithm>
 
 #include "unicode/ubidi.h"
 
@@ skipping 124 matching lines @@
   if (match.template_url) {
     TemplateURLService* url_service =
         TemplateURLServiceFactory::GetForProfile(edit_model_->profile());
     if (!url_service)
       return false;
 
     // Only show the keyword for the default provider if the user typed in
     // the keyword and it isn't SEARCH_WHAT_YOU_TYPED.
     const TemplateURL* default_url = url_service->GetDefaultSearchProvider();
     if (default_url && (default_url->id() == match.template_url->id())) {
-      if (StartsWith(autocomplete_controller()->input().text(),
-                     default_url->keyword(), false) &&
+      const string16& input_text = autocomplete_controller()->input().text();

[sky, 2011/09/08 14:21:50]

This shouldn't be necessary. According to the bug 'grand canyon' was input. That
should end up with a match.type of SEARCH_WHAT_YOU_TYPED. It you can reproduce
(I can't), what match.type do you end up with?

+      const string16& default_url_keyword = default_url->keyword();
+      if (StartsWith(input_text, default_url_keyword, false) &&
+          AutocompleteEditModel::IsSpaceCharForAcceptingKeyword(
+              input_text[default_url_keyword.length()]) &&
           (match.type != AutocompleteMatch::SEARCH_WHAT_YOU_TYPED)) {
         keyword->assign(match.template_url->keyword());
         return false;
       }
     } else if (TemplateURL::SupportsReplacement(match.template_url)) {
       // The current match is a keyword, return that as the selected keyword.
       keyword->assign(match.template_url->keyword());
       return false;
     }
   }
@@ skipping 102 matching lines @@
   CHECK((selected_line_ != kNoMatch) || result.empty());
   manually_selected_match_.Clear();
   // If we're going to trim the window size to no longer include the hovered
   // line, turn hover off.  Practically, this shouldn't happen, but it
   // doesn't hurt to be defensive.
   if ((hovered_line_ != kNoMatch) && (result.size() <= hovered_line_))
     SetHoveredLine(kNoMatch);
 
   view_->UpdatePopupAppearance();
 }