Local omnibox treats navsuggest suggestions as queries.

chrome/browser/ui/search/instant_extended_manual_interactive_uitest.cc

Index: chrome/browser/ui/search/instant_extended_manual_interactive_uitest.cc
diff --git a/chrome/browser/ui/search/instant_extended_manual_interactive_uitest.cc b/chrome/browser/ui/search/instant_extended_manual_interactive_uitest.cc
index 4b4f2185b2204cbe9cf1393e61cef3832d49189a..13911a2567b947f78397725a11e2ce845d0b766a 100644
--- a/chrome/browser/ui/search/instant_extended_manual_interactive_uitest.cc
+++ b/chrome/browser/ui/search/instant_extended_manual_interactive_uitest.cc
@@ -142,7 +142,7 @@ IN_PROC_BROWSER_TEST_F(InstantExtendedManualTest,
   EXPECT_FALSE(instant()->GetOverlayContents());
 
   // Refocus the omnibox. The InstantController should've preloaded Instant.
-  FocusOmniboxAndWaitForInstantExtendedSupport();
+  FocusOmniboxAndWaitForInstantOverlayAndNTPSupport();
   EXPECT_TRUE(OverlayIsGoogle());
 
   EXPECT_FALSE(ui_test_utils::IsViewFocused(browser(), VIEW_ID_TAB_CONTAINER));
@@ -159,7 +159,7 @@ IN_PROC_BROWSER_TEST_F(InstantExtendedManualTest,
 IN_PROC_BROWSER_TEST_F(InstantExtendedManualTest,
                        DISABLED_BackspaceFromQueryToSameQueryAndSearch) {
   set_browser(browser());
-  FocusOmniboxAndWaitForInstantExtendedSupport();
+  FocusOmniboxAndWaitForInstantOverlayAndNTPSupport();
   EXPECT_TRUE(OverlayIsGoogle());
 
   // Type "face" and expect Google to set gray text for "book" to suggest
@@ -183,7 +183,7 @@ IN_PROC_BROWSER_TEST_F(InstantExtendedManualTest,
 IN_PROC_BROWSER_TEST_F(InstantExtendedManualTest,
                        DISABLED_BackspaceFromQueryToOtherQueryAndSearch) {
   set_browser(browser());
-  FocusOmniboxAndWaitForInstantExtendedSupport();
+  FocusOmniboxAndWaitForInstantOverlayAndNTPSupport();
   EXPECT_TRUE(OverlayIsGoogle());
 
   // Type "fan" and expect Google to set gray text to "dango" to suggest
@@ -208,7 +208,7 @@ IN_PROC_BROWSER_TEST_F(InstantExtendedManualTest,
 IN_PROC_BROWSER_TEST_F(InstantExtendedManualTest,
                        DISABLED_BackspaceFromUrlToNonSelectedUrlAndSearch) {
   set_browser(browser());
-  FocusOmniboxAndWaitForInstantExtendedSupport();
+  FocusOmniboxAndWaitForInstantOverlayAndNTPSupport();
   EXPECT_TRUE(OverlayIsGoogle());
 
   // Type "facebook.c" and expect Google to set blue text to "om" to suggest
@@ -238,7 +238,7 @@ IN_PROC_BROWSER_TEST_F(InstantExtendedManualTest,
 IN_PROC_BROWSER_TEST_F(InstantExtendedManualTest,
                        MANUAL_BackspaceFromUrlToUrlAndNavigate) {
   set_browser(browser());
-  FocusOmniboxAndWaitForInstantExtendedSupport();
+  FocusOmniboxAndWaitForInstantOverlayAndNTPSupport();
   EXPECT_TRUE(OverlayIsGoogle());
 
   // Type "facebook.com/" and expect Google to set blue text to "login.php" to
@@ -269,7 +269,7 @@ IN_PROC_BROWSER_TEST_F(InstantExtendedManualTest,
 IN_PROC_BROWSER_TEST_F(InstantExtendedManualTest,
                        DISABLED_BackspaceFromQueryToSelectedUrlAndNavigate) {
   set_browser(browser());
-  FocusOmniboxAndWaitForInstantExtendedSupport();
+  FocusOmniboxAndWaitForInstantOverlayAndNTPSupport();
   EXPECT_TRUE(OverlayIsGoogle());
 
   // Type "a.cop" and expect Google to set gray text to "land" to suggest the
@@ -297,7 +297,7 @@ IN_PROC_BROWSER_TEST_F(InstantExtendedManualTest,
 IN_PROC_BROWSER_TEST_F(InstantExtendedManualTest,
                        DISABLED_BackspaceFromSelectedUrlToQueryAndSearch) {
   set_browser(browser());
-  FocusOmniboxAndWaitForInstantExtendedSupport();
+  FocusOmniboxAndWaitForInstantOverlayAndNTPSupport();
   EXPECT_TRUE(OverlayIsGoogle());
 
   // Type "e.co/" and expect the top suggestion to be the URL "e.co/".
@@ -326,7 +326,7 @@ IN_PROC_BROWSER_TEST_F(InstantExtendedManualTest,
 
 IN_PROC_BROWSER_TEST_F(InstantExtendedManualTest, MANUAL_TypeURLAndPressEnter) {
   set_browser(browser());
-  FocusOmniboxAndWaitForInstantExtendedSupport();
+  FocusOmniboxAndWaitForInstantOverlayAndNTPSupport();
   EXPECT_TRUE(OverlayIsGoogle());
 
   // Type "www.facebook.com" and expect the top suggestion to be the URL
@@ -347,7 +347,7 @@ IN_PROC_BROWSER_TEST_F(InstantExtendedManualTest, MANUAL_TypeURLAndPressEnter) {
 IN_PROC_BROWSER_TEST_F(InstantExtendedManualTest,
                        DISABLED_TypeAutocompletedURLAndPressEnter) {
   set_browser(browser());
-  FocusOmniboxAndWaitForInstantExtendedSupport();
+  FocusOmniboxAndWaitForInstantOverlayAndNTPSupport();
   EXPECT_TRUE(OverlayIsGoogle());
 
   // Type "www.facebook." and expect the top suggestion to be the URL
@@ -368,7 +368,7 @@ IN_PROC_BROWSER_TEST_F(InstantExtendedManualTest,
 IN_PROC_BROWSER_TEST_F(InstantExtendedManualTest,
                        DISABLED_PasteURLAndPressEnter) {
   set_browser(browser());
-  FocusOmniboxAndWaitForInstantExtendedSupport();
+  FocusOmniboxAndWaitForInstantOverlayAndNTPSupport();
   EXPECT_TRUE(OverlayIsGoogle());
 
   // Paste "www.facebook.com" and expect the top suggestion to be the URL
@@ -393,7 +393,7 @@ IN_PROC_BROWSER_TEST_F(InstantExtendedManualTest,
 
 IN_PROC_BROWSER_TEST_F(InstantExtendedManualTest, MANUAL_PasteAndGo) {
   set_browser(browser());
-  FocusOmniboxAndWaitForInstantExtendedSupport();
+  FocusOmniboxAndWaitForInstantOverlayAndNTPSupport();
   EXPECT_TRUE(OverlayIsGoogle());
 
   // "Paste and Go" with the text www.facebook.com.
@@ -408,7 +408,7 @@ IN_PROC_BROWSER_TEST_F(InstantExtendedManualTest, MANUAL_PasteAndGo) {
 IN_PROC_BROWSER_TEST_F(InstantExtendedManualTest,
                        MANUAL_TypeSearchAndPressControlEnter) {
   set_browser(browser());
-  FocusOmniboxAndWaitForInstantExtendedSupport();
+  FocusOmniboxAndWaitForInstantOverlayAndNTPSupport();
   EXPECT_TRUE(OverlayIsGoogle());
 
   // Type "example" and expect Google to suggest a query, i.e., no blue text.