Omnibox - Keyword Provider Shouldn't Bold What-You-Typed Queries

components/omnibox/browser/keyword_provider_unittest.cc

 // Copyright 2014 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 "components/omnibox/browser/keyword_provider.h"
 
 #include <stddef.h>
 #include <utility>
 
 #include "base/command_line.h"
@@ skipping 358 matching lines @@
   };
 
   SetUpClientAndKeywordProvider();
   RunTest<GURL>(url_cases, arraysize(url_cases),
                 &AutocompleteMatch::destination_url);
 }
 
 TEST_F(KeywordProviderTest, Contents) {
   const MatchType<base::string16> kEmptyMatch = { base::string16(), false };
   TestData<base::string16> contents_cases[] = {
-    // No query input -> substitute "<enter query>" into contents.
+    // No query input -> substitute "<Type search term>" into contents.
     { ASCIIToUTF16("z"), 1,
-      { { ASCIIToUTF16("Search z for <enter query>"), true },
+      { { ASCIIToUTF16("<Type search term>"), true },
         kEmptyMatch, kEmptyMatch } },
     { ASCIIToUTF16("z    \t"), 1,
-      { { ASCIIToUTF16("Search z for <enter query>"), true },
+      { { ASCIIToUTF16("<Type search term>"), true },
         kEmptyMatch, kEmptyMatch } },
 
     // Exact keyword matches with remaining text should return nothing.
     { ASCIIToUTF16("www.www www"), 0,
       { kEmptyMatch, kEmptyMatch, kEmptyMatch } },
     { ASCIIToUTF16("z   a   b   c++"), 0,
       { kEmptyMatch, kEmptyMatch, kEmptyMatch } },
 
     // Exact keyword matches with remaining text when the keyword is an
     // extension keyword should return something.  This is tested in
     // chrome/browser/extensions/api/omnibox/omnibox_apitest.cc's
     // in OmniboxApiTest's Basic test.
 
-    // Substitution should work with various locations of the "%s".
+    // There are two keywords that start with "aaa".  Suggestions will be
+    // disambiguated by the description.  We do not test the description value
+    // here because KeywordProvider doesn't set descriptions; these are
+    // populated later by AutocompleteController.
     { ASCIIToUTF16("aaa"), 2,
-      { { ASCIIToUTF16("Search aaaa for <enter query>"), false },
-        { ASCIIToUTF16("Search aaaaa for <enter query>"), false },
+      { { ASCIIToUTF16("<Type search term>"), false },
+        { ASCIIToUTF16("<Type search term>"), false },
         kEmptyMatch} },
+    // When there is a search string, simply display it.
     { ASCIIToUTF16("www.w w"), 2,
-      { { ASCIIToUTF16("Search www for w"), false },
-        { ASCIIToUTF16("Search weasel for w"), false },
+      { { ASCIIToUTF16("w"), false },
+        { ASCIIToUTF16("w"), false },
         kEmptyMatch } },
     // Also, check that tokenization only collapses whitespace between first
     // tokens and contents are not escaped or unescaped.
     { ASCIIToUTF16("a   1 2+ 3"), 3,
-      { { ASCIIToUTF16("Search aa for 1 2+ 3"), false },
-        { ASCIIToUTF16("Search ab for 1 2+ 3"), false },
-        { ASCIIToUTF16("Search aaaa for 1 2+ 3"), false } } },
+      { { ASCIIToUTF16("1 2+ 3"), false },
+        { ASCIIToUTF16("1 2+ 3"), false },
+        { ASCIIToUTF16("1 2+ 3"), false } } },
   };
 
   SetUpClientAndKeywordProvider();
   RunTest<base::string16>(contents_cases, arraysize(contents_cases),
                           &AutocompleteMatch::contents);
 }
 
 TEST_F(KeywordProviderTest, AddKeyword) {
   SetUpClientAndKeywordProvider();
   TemplateURLData data;
@@ skipping 108 matching lines @@
 
 TEST_F(KeywordProviderTest, DoesNotProvideMatchesOnFocus) {
   SetUpClientAndKeywordProvider();
   AutocompleteInput input(ASCIIToUTF16("aaa"), base::string16::npos,
                           std::string(), GURL(),
                           metrics::OmniboxEventProto::INVALID_SPEC, true, false,
                           true, true, true, TestingSchemeClassifier());
   kw_provider_->Start(input, false);
   ASSERT_TRUE(kw_provider_->matches().empty());
 }