Fix keyword search erroneously not triggering in two obscure cases:

chrome/browser/ui/omnibox/omnibox_view_browsertest.cc

 // Copyright (c) 2012 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 <stdio.h>
 
 #include "base/message_loop.h"
 #include "base/string16.h"
 #include "base/string_util.h"
 #include "base/time.h"
@@ skipping 36 matching lines @@
 #include "ui/views/events/event.h"
 #include "ui/views/widget/widget.h"
 #endif
 
 using base::Time;
 using base::TimeDelta;
 
 namespace {
 
 const char kSearchKeyword[] = "foo";
+const char kSearchKeyword2[] = "footest.com";
 const wchar_t kSearchKeywordKeys[] = {
   ui::VKEY_F, ui::VKEY_O, ui::VKEY_O, 0
 };
 const char kSearchURL[] = "http://www.foo.com/search?q={searchTerms}";
 const char kSearchShortName[] = "foo";
 const char kSearchText[] = "abc";
 const wchar_t kSearchTextKeys[] = {
   ui::VKEY_A, ui::VKEY_B, ui::VKEY_C, 0
 };
 const char kSearchTextURL[] = "http://www.foo.com/search?q=abc";
@@ skipping 216 matching lines @@
     for (TemplateURLService::TemplateURLVector::const_iterator
          i = builtins.begin(); i != builtins.end(); ++i)
       model->Remove(*i);
 
     TemplateURL* template_url = new TemplateURL();
     template_url->SetURL(kSearchURL, 0, 0);
     template_url->set_keyword(ASCIIToUTF16(kSearchKeyword));
     template_url->set_short_name(ASCIIToUTF16(kSearchShortName));
     model->Add(template_url);
     model->SetDefaultSearchProvider(template_url);
+
+    TemplateURL* second_url = new TemplateURL();
+    second_url->SetURL(kSearchURL, 0, 0);
+    second_url->set_keyword(ASCIIToUTF16(kSearchKeyword2));
+    second_url->set_short_name(ASCIIToUTF16(kSearchShortName));
+    model->Add(second_url);
   }
 
   void AddHistoryEntry(const TestHistoryEntry& entry, const Time& time) {
     Profile* profile = browser()->profile();
     HistoryService* history_service =
         profile->GetHistoryService(Profile::EXPLICIT_ACCESS);
     ASSERT_TRUE(history_service);
 
     if (!history_service->BackendLoaded()) {
       content::NotificationRegistrar registrar;
@@ skipping 565 matching lines @@
 
     // Keyword hint shouldn't be visible.
     ASSERT_FALSE(omnibox_view->model()->is_keyword_hint());
     ASSERT_TRUE(omnibox_view->model()->keyword().empty());
 
     // Trigger keyword mode by space.
     ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_SPACE, 0));
     ASSERT_FALSE(omnibox_view->model()->is_keyword_hint());
     ASSERT_EQ(search_keyword, omnibox_view->model()->keyword());
     ASSERT_TRUE(omnibox_view->GetText().empty());
+
+    // Space in the middle of a temporary text, which separates the text into
+    // keyword and replacement portions, should trigger keyword mode.
+    omnibox_view->SetUserText(string16());
+    ASSERT_NO_FATAL_FAILURE(SendKeySequence(kSearchKeywordKeys));
+    ASSERT_NO_FATAL_FAILURE(WaitForAutocompleteControllerDone());
+    AutocompletePopupModel* popup_model = omnibox_view->model()->popup_model();
+    ASSERT_TRUE(popup_model->IsOpen());
+    ASSERT_EQ(ASCIIToUTF16("foobar.com"), omnibox_view->GetText());
+    omnibox_view->model()->OnUpOrDownKeyPressed(1);
+    omnibox_view->model()->OnUpOrDownKeyPressed(-1);
+    ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_LEFT, 0));
+    ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_LEFT, 0));
+    ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_LEFT, 0));
+    ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_LEFT, 0));
+    ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_LEFT, 0));
+    ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_LEFT, 0));
+    ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_LEFT, 0));
+    ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_SPACE, 0));
+    ASSERT_FALSE(omnibox_view->model()->is_keyword_hint());
+    ASSERT_EQ(search_keyword, omnibox_view->model()->keyword());
+    ASSERT_EQ(ASCIIToUTF16("bar.com"), omnibox_view->GetText());
+
+    // Space after temporary text that looks like a keyword, when the original
+    // input does not look like a keyword, should trigger keyword mode.
+    omnibox_view->SetUserText(string16());
+    const TestHistoryEntry kHistoryFoo = {
+      "http://footest.com", "Page footest", kSearchText, 1000, 1000, true
+    };
+
+    // Add a history entry to trigger HQP matching with text == keyword when
+    // typing "fo te".
+    ASSERT_NO_FATAL_FAILURE(
+        AddHistoryEntry(kHistoryFoo, Time::Now() - TimeDelta::FromMinutes(10)));
+
+    ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_F, 0));
+    ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_O, 0));
+    ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_SPACE, 0));
+    ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_T, 0));
+    ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_E, 0));
+    ASSERT_NO_FATAL_FAILURE(WaitForAutocompleteControllerDone());
+    ASSERT_TRUE(popup_model->IsOpen());
+    string16 search_keyword2(ASCIIToUTF16(kSearchKeyword2));
+    while ((omnibox_view->GetText() != search_keyword2) &&
+           (popup_model->selected_line() < popup_model->result().size() - 1))
+      omnibox_view->model()->OnUpOrDownKeyPressed(1);
+    ASSERT_EQ(search_keyword2, omnibox_view->GetText());
+    ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_SPACE, 0));
+    ASSERT_FALSE(omnibox_view->model()->is_keyword_hint());
+    ASSERT_EQ(search_keyword2, omnibox_view->model()->keyword());
+    ASSERT_TRUE(omnibox_view->GetText().empty());
   }
 
   void NonSubstitutingKeywordTest() {
     OmniboxView* omnibox_view = NULL;
     ASSERT_NO_FATAL_FAILURE(GetOmniboxView(&omnibox_view));
     AutocompletePopupModel* popup_model = omnibox_view->model()->popup_model();
     ASSERT_TRUE(popup_model);
 
     TemplateURLService* template_url_service =
         TemplateURLServiceFactory::GetForProfile(browser()->profile());
@@ skipping 531 matching lines @@
 
   // Paste text.
   ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_V, ui::EF_CONTROL_DOWN));
   ASSERT_NO_FATAL_FAILURE(WaitForAutocompleteControllerDone());
   ASSERT_TRUE(popup_model->IsOpen());
 
   // Inline autocomplete shouldn't be triggered.
   ASSERT_EQ(ASCIIToUTF16("abc"), omnibox_view->GetText());
 }
 #endif