Omnibox: Make Exact Match Tab-to-Search Work

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/command_line.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 39 matching lines @@
 using base::ASCIIToUTF16;
 using base::UTF16ToUTF8;
 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 wchar_t kSearchKeywordPrefixKeys[] = { ui::VKEY_F, ui::VKEY_O, 0 };
+const wchar_t kSearchKeywordCompletionKeys[] = { ui::VKEY_O, 0 };

[Peter Kasting, 2014/08/05 21:03:47]

Nit: Since these are only used by SendKeySequence(), and that's defined within
this file, can we fix up the function prototype while we're here to take a
ui::KeyboardCode* instead of a wchar_t*?  It looks really confusing to have
these arrays with VKEY members but the type of the array is "wchar_t[]".

[Mark P, 2014/08/05 22:20:06]

Done.

 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";
 
 const char kInlineAutocompleteText[] = "def";
 const wchar_t kInlineAutocompleteTextKeys[] = {
   ui::VKEY_D, ui::VKEY_E, ui::VKEY_F, 0
 };
@@ skipping 852 matching lines @@
   // Space should accept keyword even when inline autocomplete is available.
   omnibox_view->SetUserText(base::string16());
   const TestHistoryEntry kHistoryFoobar = {
     "http://www.foobar.com", "Page foobar", 100, 100, true
   };
 
   // Add a history entry to trigger inline autocomplete when typing "foo".
   ASSERT_NO_FATAL_FAILURE(
       AddHistoryEntry(kHistoryFoobar, Time::Now() - TimeDelta::FromHours(1)));
 
-  // Type "foo" to trigger inline autocomplete.
-  ASSERT_NO_FATAL_FAILURE(SendKeySequence(kSearchKeywordKeys));
+  // Type "fo" to trigger inline autocomplete.
+  ASSERT_NO_FATAL_FAILURE(SendKeySequence(kSearchKeywordPrefixKeys));
   ASSERT_NO_FATAL_FAILURE(WaitForAutocompleteControllerDone());
   ASSERT_TRUE(omnibox_view->model()->popup_model()->IsOpen());
   ASSERT_NE(search_keyword, omnibox_view->GetText());
 
   // Keyword hint shouldn't be visible.
   ASSERT_FALSE(omnibox_view->model()->is_keyword_hint());
   ASSERT_TRUE(omnibox_view->model()->keyword().empty());
 
+  // Add the "o".  Inline autocompletion should still happen, but now we
+  // should also get a keyword hint because we've typed a keyword exactly.
+  ASSERT_NO_FATAL_FAILURE(SendKeySequence(kSearchKeywordCompletionKeys));
+  ASSERT_NO_FATAL_FAILURE(WaitForAutocompleteControllerDone());
+  ASSERT_TRUE(omnibox_view->model()->popup_model()->IsOpen());
+  ASSERT_NE(search_keyword, omnibox_view->GetText());
+  ASSERT_TRUE(omnibox_view->model()->is_keyword_hint());
+  ASSERT_FALSE(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(base::string16());
   ASSERT_NO_FATAL_FAILURE(SendKeySequence(kSearchKeywordKeys));
@@ skipping 834 matching lines @@
   omnibox_view->Update();
   EXPECT_EQ(url_c, omnibox_view->GetText());
 }
 
 IN_PROC_BROWSER_TEST_F(OmniboxViewTest, EscDisablesSearchTermReplacement) {
   browser()->toolbar_model()->set_url_replacement_enabled(true);
   chrome::FocusLocationBar(browser());
   ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_ESCAPE, 0));
   EXPECT_FALSE(browser()->toolbar_model()->url_replacement_enabled());
 }