Omnibox: Create Keyword Verbatim Result in Search Provider

chrome/browser/autocomplete/autocomplete_provider_unittest.cc

Index: chrome/browser/autocomplete/autocomplete_provider_unittest.cc
diff --git a/chrome/browser/autocomplete/autocomplete_provider_unittest.cc b/chrome/browser/autocomplete/autocomplete_provider_unittest.cc
index 87d5f89715738e02b33546b08a5e32f48fc97af0..ca97875cd1b6da65d6237ae05504b6846fb8e7a3 100644
--- a/chrome/browser/autocomplete/autocomplete_provider_unittest.cc
+++ b/chrome/browser/autocomplete/autocomplete_provider_unittest.cc
@@ -397,15 +397,20 @@ void AutocompleteProviderTest::RunExactKeymatchTest(
     bool allow_exact_keyword_match) {
   // Send the controller input which exactly matches the keyword provider we
   // created in ResetControllerWithKeywordAndSearchProviders().  The default
-  // match should thus be a keyword match iff |allow_exact_keyword_match| is
-  // true.
+  // match should thus be a search-other-engine  match iff

[Bart N., 2013/01/30 21:36:21]

Extra space before "match".

[Mark P, 2013/01/30 22:19:45]

Done.

+  // |allow_exact_keyword_match| is true.  Regardless, the match should
+  // be from SearchProvider.  (It provides all verbatim search matches,
+  // keyword or not.)
   controller_->Start(AutocompleteInput(
       ASCIIToUTF16("k test"), string16::npos, string16(), true, false,
       allow_exact_keyword_match, AutocompleteInput::SYNCHRONOUS_MATCHES));
   EXPECT_TRUE(controller_->done());
-  EXPECT_EQ(allow_exact_keyword_match ?
-      AutocompleteProvider::TYPE_KEYWORD : AutocompleteProvider::TYPE_SEARCH,
+  EXPECT_EQ(AutocompleteProvider::TYPE_SEARCH,
       controller_->result().default_match()->provider->type());
+  EXPECT_EQ(allow_exact_keyword_match ?
+      AutocompleteMatch::SEARCH_OTHER_ENGINE :
+      AutocompleteMatch::SEARCH_WHAT_YOU_TYPED,
+      controller_->result().default_match()->type);
 }
 
 void AutocompleteProviderTest::Observe(