Omnibox: Create Keyword Verbatim Result in Search Provider

chrome/browser/extensions/api/omnibox/omnibox_apitest.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 "base/format_macros.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete_input.h"
 #include "chrome/browser/autocomplete/autocomplete_match.h"
@@ skipping 45 matching lines @@
   void WaitForAutocompleteDone(AutocompleteController* controller) {
     while (!controller->done()) {
       content::WindowedNotificationObserver ready_observer(
           chrome::NOTIFICATION_AUTOCOMPLETE_CONTROLLER_RESULT_READY,
           content::Source<AutocompleteController>(controller));
       ready_observer.Wait();
     }
   }
 };
 
-// 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
   // loaded so that the autocomplete results are consistent.
   ui_test_utils::WaitForTemplateURLServiceToLoad(
       TemplateURLServiceFactory::GetForProfile(browser()->profile()));
 
-  LocationBar* location_bar = GetLocationBar(browser());
   AutocompleteController* autocomplete_controller =
       GetAutocompleteController(browser());
 
   // Test that our extension's keyword is suggested to us when we partially type
   // it.
   {
     autocomplete_controller->Start(
         AutocompleteInput(ASCIIToUTF16("keywor"), string16::npos, string16(),
                           true, false, true, AutocompleteInput::ALL_MATCHES));
     WaitForAutocompleteDone(autocomplete_controller);
@@ skipping 21 matching lines @@
     WaitForAutocompleteDone(autocomplete_controller);
     EXPECT_TRUE(autocomplete_controller->done());
 
     // Now, peek into the controller to see if it has the results we expect.
     // First result should be to invoke the keyword with what we typed, 2-4
     // should be to invoke with suggestions from the extension, and the last
     // should be to search for what we typed.
     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(AutocompleteMatch::SEARCH_OTHER_ENGINE, result.match_at(0).type);
+    EXPECT_EQ(AutocompleteProvider::TYPE_KEYWORD,
+              result.match_at(0).provider->type());
+    EXPECT_EQ(ASCIIToUTF16("keyword"), result.match_at(1).keyword);
     EXPECT_EQ(ASCIIToUTF16("keyword suggestion1"),
               result.match_at(1).fill_into_edit);
+    EXPECT_EQ(AutocompleteProvider::TYPE_KEYWORD,
+              result.match_at(1).provider->type());
+    EXPECT_EQ(ASCIIToUTF16("keyword"), result.match_at(2).keyword);
     EXPECT_EQ(ASCIIToUTF16("keyword suggestion2"),
               result.match_at(2).fill_into_edit);
+    EXPECT_EQ(AutocompleteProvider::TYPE_KEYWORD,
+              result.match_at(2).provider->type());
+    EXPECT_EQ(ASCIIToUTF16("keyword"), result.match_at(3).keyword);
     EXPECT_EQ(ASCIIToUTF16("keyword suggestion3"),
               result.match_at(3).fill_into_edit);
+    EXPECT_EQ(AutocompleteProvider::TYPE_KEYWORD,
+              result.match_at(3).provider->type());
 
     string16 description =
         ASCIIToUTF16("Description with style: <match>, [dim], (url till end)");
     EXPECT_EQ(description, result.match_at(1).contents);
     ASSERT_EQ(6u, result.match_at(1).contents_class.size());
 
     EXPECT_EQ(0u,
               result.match_at(1).contents_class[0].offset);
     EXPECT_EQ(ACMatchClassification::NONE,
               result.match_at(1).contents_class[0].style);
@@ skipping 18 matching lines @@
     EXPECT_EQ(ACMatchClassification::NONE,
               result.match_at(1).contents_class[4].style);
 
     EXPECT_EQ(description.find('('),
               result.match_at(1).contents_class[5].offset);
     EXPECT_EQ(ACMatchClassification::URL,
               result.match_at(1).contents_class[5].style);
 
     AutocompleteMatch match = result.match_at(4);
     EXPECT_EQ(AutocompleteMatch::SEARCH_WHAT_YOU_TYPED, match.type);
+    EXPECT_EQ(AutocompleteProvider::TYPE_SEARCH,
+              result.match_at(4).provider->type());
     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
 // a given query.
 // http://crbug.com/88552
 IN_PROC_BROWSER_TEST_F(OmniboxApiTest, PopupStaysClosed) {
   ASSERT_TRUE(RunExtensionTest("omnibox")) << message_;
 
   // The results depend on the TemplateURLService being loaded. Make sure it is
   // loaded so that the autocomplete results are consistent.
@@ skipping 85 matching lines @@
   {
     ResultCatcher catcher;
     autocomplete_controller->Start(
         AutocompleteInput(ASCIIToUTF16("keyword command incognito"),
                           string16::npos, string16(), true, false, true,
                           AutocompleteInput::ALL_MATCHES));
     location_bar->AcceptInput();
     EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
   }
 }