Omnibox: Create Keyword Verbatim Result in Search Provider

chrome/browser/extensions/api/omnibox/omnibox_apitest.cc

Index: chrome/browser/extensions/api/omnibox/omnibox_apitest.cc
diff --git a/chrome/browser/extensions/api/omnibox/omnibox_apitest.cc b/chrome/browser/extensions/api/omnibox/omnibox_apitest.cc
index 22c23049acf71052f86877b304f6f0dafe99723a..aab5ce1a58cabd3b1695f26b52ae5040e3f5562a 100644
--- a/chrome/browser/extensions/api/omnibox/omnibox_apitest.cc
+++ b/chrome/browser/extensions/api/omnibox/omnibox_apitest.cc
@@ -63,8 +63,7 @@ class OmniboxApiTest : public ExtensionApiTest {
   }
 };
 
-// Flaky, http://crbug.com/167158 .
-IN_PROC_BROWSER_TEST_F(OmniboxApiTest, DISABLED_Basic) {
+IN_PROC_BROWSER_TEST_F(OmniboxApiTest, Basic) {
   ASSERT_TRUE(RunExtensionTest("omnibox")) << message_;
 
   // The results depend on the TemplateURLService being loaded. Make sure it is
@@ -72,7 +71,6 @@ IN_PROC_BROWSER_TEST_F(OmniboxApiTest, DISABLED_Basic) {
   ui_test_utils::WaitForTemplateURLServiceToLoad(
       TemplateURLServiceFactory::GetForProfile(browser()->profile()));
 
-  LocationBar* location_bar = GetLocationBar(browser());
   AutocompleteController* autocomplete_controller =
       GetAutocompleteController(browser());
 
@@ -114,13 +112,16 @@ IN_PROC_BROWSER_TEST_F(OmniboxApiTest, DISABLED_Basic) {
     const AutocompleteResult& result = autocomplete_controller->result();
     ASSERT_EQ(5U, result.size()) << AutocompleteResultAsString(result);
 
-    ASSERT_FALSE(result.match_at(0).keyword.empty());
+    EXPECT_EQ(ASCIIToUTF16("keyword"), result.match_at(0).keyword);
     EXPECT_EQ(ASCIIToUTF16("keyword suggestio"),
               result.match_at(0).fill_into_edit);
+    EXPECT_EQ(ASCIIToUTF16("keyword"), result.match_at(1).keyword);
     EXPECT_EQ(ASCIIToUTF16("keyword suggestion1"),
               result.match_at(1).fill_into_edit);
+    EXPECT_EQ(ASCIIToUTF16("keyword"), result.match_at(2).keyword);
     EXPECT_EQ(ASCIIToUTF16("keyword suggestion2"),
               result.match_at(2).fill_into_edit);
+    EXPECT_EQ(ASCIIToUTF16("keyword"), result.match_at(3).keyword);
     EXPECT_EQ(ASCIIToUTF16("keyword suggestion3"),
               result.match_at(3).fill_into_edit);
 
@@ -164,17 +165,21 @@ IN_PROC_BROWSER_TEST_F(OmniboxApiTest, DISABLED_Basic) {
     EXPECT_FALSE(match.deletable);
   }
 
+  // Flaky, see http://crbug.com/167158
+  /*
   {
+    LocationBar* location_bar = GetLocationBar(browser());
     ResultCatcher catcher;
     OmniboxView* omnibox_view = location_bar->GetLocationEntry();
     omnibox_view->OnBeforePossibleChange();
-    omnibox_view->SetUserText( ASCIIToUTF16("keyword command"));
+    omnibox_view->SetUserText(ASCIIToUTF16("keyword command"));
     omnibox_view->OnAfterPossibleChange();
     location_bar->AcceptInput();
     // This checks that the keyword provider (via javascript)
     // gets told to navigate to the string "command".
     EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
   }
+  */
 }
 
 // Tests that the autocomplete popup doesn't reopen after accepting input for