Local omnibox treats navsuggest suggestions as queries.

chrome/browser/ui/search/instant_extended_interactive_uitest.cc

 // Copyright 2013 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 <sstream>
 
 #include "base/prefs/pref_service.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
+#include "base/strings/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete_controller.h"
 #include "chrome/browser/autocomplete/autocomplete_match.h"
 #include "chrome/browser/autocomplete/autocomplete_provider.h"
 #include "chrome/browser/autocomplete/autocomplete_result.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/favicon/favicon_tab_helper.h"
 #include "chrome/browser/history/history_types.h"
 #include "chrome/browser/history/top_sites.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search/instant_service.h"
 #include "chrome/browser/search/instant_service_factory.h"
 #include "chrome/browser/search/search.h"
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/themes/theme_service_factory.h"
 #include "chrome/browser/ui/omnibox/omnibox_view.h"
 #include "chrome/browser/ui/search/instant_commit_type.h"
 #include "chrome/browser/ui/search/instant_ntp.h"
 #include "chrome/browser/ui/search/instant_overlay.h"
 #include "chrome/browser/ui/search/instant_tab.h"
 #include "chrome/browser/ui/search/instant_test_utils.h"
 #include "chrome/browser/ui/search/search_tab_helper.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/webui/theme_source.h"
 #include "chrome/common/chrome_notification_types.h"
+#include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/thumbnail_score.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/interactive_test_utils.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_process_host.h"
@@ skipping 138 matching lines @@
   ui_test_utils::ClickOnView(browser(), VIEW_ID_TAB_CONTAINER);
 
   EXPECT_TRUE(ui_test_utils::IsViewFocused(browser(), VIEW_ID_TAB_CONTAINER));
   EXPECT_FALSE(omnibox()->model()->has_focus());
 
   // Delete any existing overlay.
   instant()->overlay_.reset();
   EXPECT_FALSE(instant()->GetOverlayContents());
 
   // Refocus the omnibox. The InstantController should've preloaded Instant.
-  FocusOmniboxAndWaitForInstantExtendedSupport();
+  FocusOmniboxAndWaitForInstantOverlayAndNTPSupport();
 
   EXPECT_FALSE(ui_test_utils::IsViewFocused(browser(), VIEW_ID_TAB_CONTAINER));
   EXPECT_TRUE(omnibox()->model()->has_focus());
 
   content::WebContents* overlay = instant()->GetOverlayContents();
   EXPECT_TRUE(overlay);
 
   // Check that the page supports Instant, but it isn't showing.
   EXPECT_TRUE(instant()->overlay_->supports_instant());
   EXPECT_FALSE(instant()->IsOverlayingSearchResults());
@@ skipping 10 matching lines @@
 
   FocusOmnibox();
   EXPECT_FALSE(ui_test_utils::IsViewFocused(browser(), VIEW_ID_TAB_CONTAINER));
   EXPECT_EQ(overlay, instant()->GetOverlayContents());
 }
 
 IN_PROC_BROWSER_TEST_F(InstantExtendedTest, InputShowsOverlay) {
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
 
   // Focus omnibox and confirm overlay isn't shown.
-  FocusOmniboxAndWaitForInstantExtendedSupport();
+  FocusOmniboxAndWaitForInstantOverlayAndNTPSupport();
   content::WebContents* overlay = instant()->GetOverlayContents();
   EXPECT_TRUE(overlay);
   EXPECT_FALSE(instant()->IsOverlayingSearchResults());
   EXPECT_TRUE(instant()->model()->mode().is_default());
 
   // Typing in the omnibox should show the overlay.
   ASSERT_TRUE(SetOmniboxTextAndWaitForOverlayToShow("query"));
   EXPECT_TRUE(instant()->model()->mode().is_search_suggestions());
   EXPECT_EQ(overlay, instant()->GetOverlayContents());
 }
 
 // Test that middle clicking on a suggestion opens the result in a new tab.
 IN_PROC_BROWSER_TEST_F(InstantExtendedTest,
                        MiddleClickOnSuggestionOpensInNewTab) {
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
-  FocusOmniboxAndWaitForInstantExtendedSupport();
+  FocusOmniboxAndWaitForInstantOverlayAndNTPSupport();
   EXPECT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser()));
 
   EXPECT_EQ(1, browser()->tab_strip_model()->count());
 
   // Typing in the omnibox should show the overlay.
   ASSERT_TRUE(SetOmniboxTextAndWaitForOverlayToShow("http://www.example.com/"));
 
   // Create an event listener that opens the top suggestion in a new tab.
   EXPECT_TRUE(ExecuteScript(
       "var rid = getApiHandle().nativeSuggestions[0].rid;"
@@ skipping 17 matching lines @@
       browser()->tab_strip_model()->GetWebContentsAt(1);
   EXPECT_EQ("http://www.example.com/", new_tab_contents->GetURL().spec());
 
   // Check that there are now two tabs.
   EXPECT_EQ(2, browser()->tab_strip_model()->count());
 }
 
 IN_PROC_BROWSER_TEST_F(InstantExtendedTest,
                        UnfocusingOmniboxDoesNotChangeSuggestions) {
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
-  FocusOmniboxAndWaitForInstantExtendedSupport();
+  FocusOmniboxAndWaitForInstantOverlayAndNTPSupport();
   EXPECT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser()));
 
   // Get a committed tab to work with.
   content::WebContents* instant_tab = instant()->GetOverlayContents();
   ASSERT_TRUE(SetOmniboxTextAndWaitForOverlayToShow("committed"));
   browser()->window()->GetLocationBar()->AcceptInput();
 
   // Put focus back into the omnibox, type, and wait for some gray text.
   EXPECT_TRUE(content::ExecuteScript(instant_tab,
                                      "suggestion = 'santa claus';"));
   SetOmniboxTextAndWaitForSuggestion("santa ");
   EXPECT_EQ(ASCIIToUTF16("claus"), GetGrayText());
   EXPECT_TRUE(content::ExecuteScript(instant_tab,
       "onChangeCalls = onNativeSuggestionsCalls = 0;"));
 
   // Now unfocus the omnibox.
   ui_test_utils::ClickOnView(browser(), VIEW_ID_TAB_CONTAINER);
   EXPECT_TRUE(UpdateSearchState(instant_tab));
   EXPECT_EQ(0, on_change_calls_);
   EXPECT_EQ(0, on_native_suggestions_calls_);
 }
 
 // Test that omnibox text is correctly set when overlay is committed with Enter.
 IN_PROC_BROWSER_TEST_F(InstantExtendedTest, OmniboxTextUponEnterCommit) {
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
-  FocusOmniboxAndWaitForInstantExtendedSupport();
+  FocusOmniboxAndWaitForInstantOverlayAndNTPSupport();
 
   // The page will autocomplete once we set the omnibox value.
   EXPECT_TRUE(ExecuteScript("suggestion = 'santa claus';"));
 
   // Set the text, and wait for suggestions to show up.
   ASSERT_TRUE(SetOmniboxTextAndWaitForOverlayToShow("santa"));
   EXPECT_EQ(ASCIIToUTF16("santa"), omnibox()->GetText());
 
   // Test that the current suggestion is correctly set.
   EXPECT_EQ(ASCIIToUTF16(" claus"), GetGrayText());
 
   // Commit the search by pressing Enter.
   browser()->window()->GetLocationBar()->AcceptInput();
 
   // 'Enter' commits the query as it was typed.
   EXPECT_EQ(ASCIIToUTF16("santa"), omnibox()->GetText());
 
   // Suggestion should be cleared at this point.
   EXPECT_EQ(ASCIIToUTF16(""), GetGrayText());
 }
 
 // Test that omnibox text is correctly set when committed with focus lost.
 IN_PROC_BROWSER_TEST_F(InstantExtendedTest, OmniboxTextUponFocusLostCommit) {
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
-  FocusOmniboxAndWaitForInstantExtendedSupport();
+  FocusOmniboxAndWaitForInstantOverlayAndNTPSupport();
 
   // Set autocomplete text (grey text).
   EXPECT_TRUE(ExecuteScript("suggestion = 'johnny depp';"));
 
   // Set the text, and wait for suggestions to show up.
   ASSERT_TRUE(SetOmniboxTextAndWaitForOverlayToShow("johnny"));
   EXPECT_EQ(ASCIIToUTF16("johnny"), omnibox()->GetText());
 
   // Test that the current suggestion is correctly set.
   EXPECT_EQ(ASCIIToUTF16(" depp"), GetGrayText());
 
   // Commit the overlay by lost focus (e.g. clicking on the page).
   instant()->CommitIfPossible(INSTANT_COMMIT_FOCUS_LOST);
 
   // Omnibox text and suggestion should not be changed.
   EXPECT_EQ(ASCIIToUTF16("johnny"), omnibox()->GetText());
   EXPECT_EQ(ASCIIToUTF16(" depp"), GetGrayText());
 }
 
 // Test that omnibox text is correctly set when clicking on committed SERP.
 // Disabled on Mac because omnibox focus loss is not working correctly.
 IN_PROC_BROWSER_TEST_F(InstantExtendedTest,
                        OmniboxTextUponFocusedCommittedSERP) {
   // Setup Instant.
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
-  FocusOmniboxAndWaitForInstantExtendedSupport();
+  FocusOmniboxAndWaitForInstantOverlayAndNTPSupport();
 
   // Create an observer to wait for the instant tab to support Instant.
   content::WindowedNotificationObserver observer(
       chrome::NOTIFICATION_INSTANT_TAB_SUPPORT_DETERMINED,
       content::NotificationService::AllSources());
 
   // Do a search and commit it.
   ASSERT_TRUE(SetOmniboxTextAndWaitForOverlayToShow("hello k"));
   EXPECT_EQ(ASCIIToUTF16("hello k"), omnibox()->GetText());
   browser()->window()->GetLocationBar()->AcceptInput();
@@ skipping 13 matching lines @@
   EXPECT_EQ(ASCIIToUTF16("hello"), omnibox()->GetText());
   EXPECT_EQ(ASCIIToUTF16(" kitty"), GetGrayText());
 }
 
 // Checks that a previous Navigation suggestion is not re-used when a search
 // suggestion comes in.
 IN_PROC_BROWSER_TEST_F(InstantExtendedTest,
                        NavigationSuggestionIsDiscardedUponSearchSuggestion) {
   // Setup Instant.
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
-  FocusOmniboxAndWaitForInstantExtendedSupport();
+  FocusOmniboxAndWaitForInstantOverlayAndNTPSupport();
 
   // Tell the page to send a URL suggestion.
   EXPECT_TRUE(ExecuteScript("suggestion = 'http://www.example.com';"
                             "behavior = 1;"));
   ASSERT_TRUE(SetOmniboxTextAndWaitForOverlayToShow("exa"));
   EXPECT_EQ(ASCIIToUTF16("example.com"), omnibox()->GetText());
 
   // Now send a search suggestion and see that Navigation suggestion is no
   // longer kept.
   EXPECT_TRUE(ExecuteScript("suggestion = 'exams are great';"
                             "behavior = 2;"));
   SetOmniboxText("exam");
   // Wait for JavaScript to run handleOnChange by executing a blank script.
   EXPECT_TRUE(ExecuteScript(std::string()));
 
   instant()->overlay()->contents()->GetView()->Focus();
   EXPECT_EQ(ASCIIToUTF16("exam"), omnibox()->GetText());
   EXPECT_EQ(ASCIIToUTF16("s are great"), GetGrayText());
 
   // TODO(jered): Remove this after fixing OnBlur().
   omnibox()->RevertAll();
 }
 
 // This test simulates a search provider using the InstantExtended API to
 // navigate through the suggested results and back to the original user query.
 IN_PROC_BROWSER_TEST_F(InstantExtendedTest, NavigateSuggestionsWithArrowKeys) {
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
-  FocusOmniboxAndWaitForInstantExtendedSupport();
+  FocusOmniboxAndWaitForInstantOverlayAndNTPSupport();
 
   ASSERT_TRUE(SetOmniboxTextAndWaitForOverlayToShow("hello"));
   EXPECT_EQ("hello", GetOmniboxText());
 
   SendDownArrow();
   EXPECT_EQ("result 1", GetOmniboxText());
   SendDownArrow();
   EXPECT_EQ("result 2", GetOmniboxText());
   SendUpArrow();
   EXPECT_EQ("result 1", GetOmniboxText());
@@ skipping 25 matching lines @@
 
 // This test simulates a search provider using the InstantExtended API to
 // navigate through the suggested results and back to the original user query.
 // If this test starts to flake, it may be that the second call to AcceptInput
 // below causes instant()->instant_tab() to no longer be valid due to e.g. a
 // navigation. In that case, see https://codereview.chromium.org/12895007/#msg28
 // and onwards for possible alternatives.
 IN_PROC_BROWSER_TEST_F(InstantExtendedTest,
                        MAYBE_NavigateToURLSuggestionHitEnterAndLookForSubmit) {
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
-  FocusOmniboxAndWaitForInstantExtendedSupport();
+  FocusOmniboxAndWaitForInstantOverlayAndNTPSupport();
 
   // Create an observer to wait for the instant tab to support Instant.
   content::WindowedNotificationObserver observer(
       chrome::NOTIFICATION_INSTANT_TAB_SUPPORT_DETERMINED,
       content::NotificationService::AllSources());
 
   // Do a search and commit it.
   ASSERT_TRUE(SetOmniboxTextAndWaitForOverlayToShow("hello k"));
   EXPECT_EQ(ASCIIToUTF16("hello k"), omnibox()->GetText());
   browser()->window()->GetLocationBar()->AcceptInput();
@@ skipping 24 matching lines @@
   EXPECT_TRUE(UpdateSearchState(instant()->instant_tab()->contents()));
   EXPECT_EQ(2, submit_count_);
   EXPECT_EQ(old_query_value, query_value_);
 }
 
 // This test simulates a search provider using the InstantExtended API to
 // navigate through the suggested results and hitting escape to get back to the
 // original user query.
 IN_PROC_BROWSER_TEST_F(InstantExtendedTest, NavigateSuggestionsAndHitEscape) {
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
-  FocusOmniboxAndWaitForInstantExtendedSupport();
+  FocusOmniboxAndWaitForInstantOverlayAndNTPSupport();
 
   ASSERT_TRUE(SetOmniboxTextAndWaitForOverlayToShow("hello"));
   EXPECT_EQ("hello", GetOmniboxText());
 
   SendDownArrow();
   EXPECT_EQ("result 1", GetOmniboxText());
   SendDownArrow();
   EXPECT_EQ("result 2", GetOmniboxText());
   SendEscape();
   EXPECT_EQ("hello", GetOmniboxText());
 
   // Ensure that the API's value is set correctly.
   std::string result;
   EXPECT_TRUE(GetStringFromJS(instant()->GetOverlayContents(),
                               "window.chrome.searchBox.value",
                               &result));
   EXPECT_EQ("hello", result);
 
   EXPECT_TRUE(HasUserInputInProgress());
   EXPECT_FALSE(HasTemporaryText());
 
   // Commit the search by pressing Enter.
   browser()->window()->GetLocationBar()->AcceptInput();
   EXPECT_EQ("hello", GetOmniboxText());
 }
 
 IN_PROC_BROWSER_TEST_F(InstantExtendedTest, PressEscapeWithBlueText) {
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
-  FocusOmniboxAndWaitForInstantExtendedSupport();
+  FocusOmniboxAndWaitForInstantOverlayAndNTPSupport();
 
   // Set blue text completion.
   EXPECT_TRUE(ExecuteScript("suggestion = 'chimichanga.com';"
                             "behavior = 1;"));
 
   ASSERT_TRUE(SetOmniboxTextAndWaitForOverlayToShow("chimi"));
 
   EXPECT_EQ(ASCIIToUTF16("chimichanga.com"), omnibox()->GetText());
   EXPECT_EQ(ASCIIToUTF16("changa.com"), GetBlueText());
   EXPECT_EQ(ASCIIToUTF16(""), GetGrayText());
@@ skipping 16 matching lines @@
   EXPECT_EQ(ASCIIToUTF16("changa.com"), GetBlueText());
   EXPECT_EQ(ASCIIToUTF16(""), GetGrayText());
 
   EXPECT_TRUE(UpdateSearchState(instant()->GetOverlayContents()));
   EXPECT_EQ(0, on_native_suggestions_calls_);
   EXPECT_EQ(0, on_change_calls_);
 }
 
 IN_PROC_BROWSER_TEST_F(InstantExtendedTest, PressEscapeWithGrayText) {
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
-  FocusOmniboxAndWaitForInstantExtendedSupport();
+  FocusOmniboxAndWaitForInstantOverlayAndNTPSupport();
 
   // Set gray text completion.
   EXPECT_TRUE(ExecuteScript("suggestion = 'cowabunga';"
                             "behavior = 2;"));
 
   ASSERT_TRUE(SetOmniboxTextAndWaitForOverlayToShow("cowa"));
 
   EXPECT_EQ(ASCIIToUTF16("cowa"), omnibox()->GetText());
   EXPECT_EQ(ASCIIToUTF16(""), GetBlueText());
   EXPECT_EQ(ASCIIToUTF16("bunga"), GetGrayText());
@@ skipping 17 matching lines @@
   EXPECT_EQ(ASCIIToUTF16("bunga"), GetGrayText());
 
   EXPECT_TRUE(UpdateSearchState(instant()->GetOverlayContents()));
   EXPECT_EQ(0, on_native_suggestions_calls_);
   EXPECT_EQ(0, on_change_calls_);
 }
 
 IN_PROC_BROWSER_TEST_F(InstantExtendedTest, NTPIsPreloaded) {
   // Setup Instant.
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
-  FocusOmniboxAndWaitForInstantExtendedSupport();
+  FocusOmniboxAndWaitForInstantOverlayAndNTPSupport();
 
   // NTP contents should be preloaded.
   ASSERT_NE(static_cast<InstantNTP*>(NULL), instant()->ntp());
   content::WebContents* ntp_contents = instant()->ntp_->contents();
   EXPECT_TRUE(ntp_contents);
 }
 
 IN_PROC_BROWSER_TEST_F(InstantExtendedTest, PreloadedNTPIsUsedInNewTab) {
   // Setup Instant.
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
-  FocusOmniboxAndWaitForInstantExtendedSupport();
+  FocusOmniboxAndWaitForInstantOverlayAndNTPSupport();
 
   // NTP contents should be preloaded.
   ASSERT_NE(static_cast<InstantNTP*>(NULL), instant()->ntp());
   content::WebContents* ntp_contents = instant()->ntp_->contents();
   EXPECT_TRUE(ntp_contents);
 
   // Open new tab. Preloaded NTP contents should have been used.
   ui_test_utils::NavigateToURLWithDisposition(
       browser(),
       GURL(chrome::kChromeUINewTabURL),
       NEW_FOREGROUND_TAB,
       ui_test_utils::BROWSER_TEST_WAIT_FOR_TAB);
   content::WebContents* active_tab =
       browser()->tab_strip_model()->GetActiveWebContents();
   EXPECT_EQ(ntp_contents, active_tab);
   EXPECT_TRUE(chrome::IsInstantNTP(active_tab));
 }
 
 IN_PROC_BROWSER_TEST_F(InstantExtendedTest, PreloadedNTPIsUsedInSameTab) {
   // Setup Instant.
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
-  FocusOmniboxAndWaitForInstantExtendedSupport();
+  FocusOmniboxAndWaitForInstantOverlayAndNTPSupport();
 
   // NTP contents should be preloaded.
   ASSERT_NE(static_cast<InstantNTP*>(NULL), instant()->ntp());
   content::WebContents* ntp_contents = instant()->ntp_->contents();
   EXPECT_TRUE(ntp_contents);
 
   // Open new tab. Preloaded NTP contents should have been used.
   ui_test_utils::NavigateToURLWithDisposition(
       browser(),
       GURL(chrome::kChromeUINewTabURL),
       CURRENT_TAB,
       ui_test_utils::BROWSER_TEST_NONE);
   content::WebContents* active_tab =
       browser()->tab_strip_model()->GetActiveWebContents();
   EXPECT_EQ(ntp_contents, active_tab);
   EXPECT_TRUE(chrome::IsInstantNTP(active_tab));
 }
 
 // TODO(samarth): re-enable when fixing the infinite reload on shutdown.
 IN_PROC_BROWSER_TEST_F(InstantExtendedTest,
                        DISABLED_PreloadedNTPForWrongProvider) {
   // Setup Instant.
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
-  FocusOmniboxAndWaitForInstantExtendedSupport();
+  FocusOmniboxAndWaitForInstantOverlayAndNTPSupport();
 
   // NTP contents should be preloaded.
   ASSERT_NE(static_cast<InstantNTP*>(NULL), instant()->ntp());
   content::WebContents* ntp_contents = instant()->ntp_->contents();
   EXPECT_TRUE(ntp_contents);
   GURL ntp_url = ntp_contents->GetURL();
 
   // Change providers.
   SetInstantURL("chrome://blank");
 
   // Open new tab. Preloaded NTP contents should have not been used.
   ui_test_utils::NavigateToURLWithDisposition(
       browser(),
       GURL(chrome::kChromeUINewTabURL),
       NEW_FOREGROUND_TAB,
       ui_test_utils::BROWSER_TEST_WAIT_FOR_TAB);
   content::WebContents* active_tab =
       browser()->tab_strip_model()->GetActiveWebContents();
   EXPECT_NE(ntp_url, active_tab->GetURL());
 }
 
 IN_PROC_BROWSER_TEST_F(InstantExtendedTest, OmniboxHasFocusOnNewTab) {
   // Setup Instant.
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
-  FocusOmniboxAndWaitForInstantExtendedSupport();
+  FocusOmniboxAndWaitForInstantOverlayAndNTPSupport();
 
   // Explicitly unfocus the omnibox.
   EXPECT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser()));
   ui_test_utils::ClickOnView(browser(), VIEW_ID_TAB_CONTAINER);
   EXPECT_FALSE(omnibox()->model()->has_focus());
 
   // Open new tab. Preloaded NTP contents should have been used.
   ui_test_utils::NavigateToURLWithDisposition(
       browser(),
       GURL(chrome::kChromeUINewTabURL),
       NEW_FOREGROUND_TAB,
       ui_test_utils::BROWSER_TEST_WAIT_FOR_TAB);
 
   // Omnibox should have focus.
   EXPECT_TRUE(omnibox()->model()->has_focus());
 }
 
 IN_PROC_BROWSER_TEST_F(InstantExtendedTest, OmniboxEmptyOnNewTabPage) {
   // Setup Instant.
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
-  FocusOmniboxAndWaitForInstantExtendedSupport();
+  FocusOmniboxAndWaitForInstantOverlayAndNTPSupport();
 
   // Open new tab. Preloaded NTP contents should have been used.
   ui_test_utils::NavigateToURLWithDisposition(
       browser(),
       GURL(chrome::kChromeUINewTabURL),
       CURRENT_TAB,
       ui_test_utils::BROWSER_TEST_NONE);
 
   // Omnibox should be empty.
   EXPECT_TRUE(omnibox()->GetText().empty());
 }
 
 // TODO(dhollowa): Fix flakes.  http://crbug.com/179930.
 IN_PROC_BROWSER_TEST_F(InstantExtendedTest, DISABLED_NoFaviconOnNewTabPage) {
   // Setup Instant.
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
-  FocusOmniboxAndWaitForInstantExtendedSupport();
+  FocusOmniboxAndWaitForInstantOverlayAndNTPSupport();
 
   // Open new tab. Preloaded NTP contents should have been used.
   ui_test_utils::NavigateToURLWithDisposition(
       browser(),
       GURL(chrome::kChromeUINewTabURL),
       CURRENT_TAB,
       ui_test_utils::BROWSER_TEST_NONE);
 
   // No favicon should be shown.
   content::WebContents* active_tab =
       browser()->tab_strip_model()->GetActiveWebContents();
   FaviconTabHelper* favicon_tab_helper =
       FaviconTabHelper::FromWebContents(active_tab);
   EXPECT_FALSE(favicon_tab_helper->ShouldDisplayFavicon());
 
   // Favicon should be shown off the NTP.
   ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUIAboutURL));
   active_tab = browser()->tab_strip_model()->GetActiveWebContents();
   favicon_tab_helper = FaviconTabHelper::FromWebContents(active_tab);
   EXPECT_TRUE(favicon_tab_helper->ShouldDisplayFavicon());
 }
 
 IN_PROC_BROWSER_TEST_F(InstantExtendedTest, InputOnNTPDoesntShowOverlay) {
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
 
   // Focus omnibox and confirm overlay isn't shown.
-  FocusOmniboxAndWaitForInstantExtendedSupport();
+  FocusOmniboxAndWaitForInstantOverlayAndNTPSupport();
   content::WebContents* overlay = instant()->GetOverlayContents();
   EXPECT_TRUE(overlay);
   EXPECT_FALSE(instant()->IsOverlayingSearchResults());
   EXPECT_TRUE(instant()->model()->mode().is_default());
 
   // Navigate to the NTP.
   ui_test_utils::NavigateToURLWithDisposition(
       browser(),
       GURL(chrome::kChromeUINewTabURL),
       CURRENT_TAB,
@@ skipping 10 matching lines @@
   // it, which is rendered in the dedicated Instant renderer process.
   //
   // TODO(sreeram): Fix this up when we stop doing crazy things on init.
   InstantService* instant_service =
         InstantServiceFactory::GetForProfile(browser()->profile());
   ASSERT_NE(static_cast<InstantService*>(NULL), instant_service);
   EXPECT_EQ(1, instant_service->GetInstantProcessCount());
 
   // Setup Instant.
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
-  FocusOmniboxAndWaitForInstantExtendedSupport();
+  FocusOmniboxAndWaitForInstantOverlayAndNTPSupport();
 
   // The registered Instant render process should still exist.
   EXPECT_EQ(1, instant_service->GetInstantProcessCount());
 
   // And the Instant overlay and ntp should live inside it.
   content::WebContents* overlay = instant()->GetOverlayContents();
   EXPECT_TRUE(instant_service->IsInstantProcess(
       overlay->GetRenderProcessHost()->GetID()));
   content::WebContents* ntp_contents = instant()->ntp_->contents();
   EXPECT_TRUE(instant_service->IsInstantProcess(
       ntp_contents->GetRenderProcessHost()->GetID()));
 
   // Navigating to the NTP should use the Instant render process.
   ui_test_utils::NavigateToURLWithDisposition(
       browser(),
       GURL(chrome::kChromeUINewTabURL),
       CURRENT_TAB,
       ui_test_utils::BROWSER_TEST_NONE);
   content::WebContents* active_tab =
       browser()->tab_strip_model()->GetActiveWebContents();
   EXPECT_TRUE(instant_service->IsInstantProcess(
       active_tab->GetRenderProcessHost()->GetID()));
 
   // Navigating elsewhere should not use the Instant render process.
   ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUIAboutURL));
   EXPECT_FALSE(instant_service->IsInstantProcess(
       active_tab->GetRenderProcessHost()->GetID()));
 }
 
+// Test that a search query will not be displayed for navsuggest queries.
+IN_PROC_BROWSER_TEST_F(
+    InstantExtendedTest, SearchQueryNotDisplayedForNavsuggest) {
+  // Use only the local overlay.
+  CommandLine::ForCurrentProcess()->AppendSwitch(
+      switches::kEnableLocalOnlyInstantExtendedAPI);
+  ASSERT_TRUE(chrome::IsLocalOnlyInstantExtendedAPIEnabled());
+
+  ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
+
+  // The second argument indicates to use only the local overlay and NTP.
+  instant()->SetInstantEnabled(true, true);
+
+  // Focus omnibox and confirm overlay isn't shown.
+  FocusOmniboxAndWaitForInstantOverlaySupport();
+
+  // Typing in the omnibox should show the overlay.
+  SetOmniboxText("face");
+
+  // Create an event listener that opens the top suggestion in a new tab.
+  content::WebContents* overlay = instant()->GetOverlayContents();
+
+  // Add a navsuggest suggestion.
+  instant()->SetSuggestions(
+      instant()->overlay()->contents(),
+      std::vector<InstantSuggestion>(
+          1,
+          InstantSuggestion(ASCIIToUTF16("http://facemash.com/"),
+                            INSTANT_COMPLETE_NOW,
+                            INSTANT_SUGGESTION_URL,
+                            ASCIIToUTF16("face"))));
+
+  while (!omnibox()->model()->autocomplete_controller()->done()) {
+    content::WindowedNotificationObserver autocomplete_observer(
+        chrome::NOTIFICATION_AUTOCOMPLETE_CONTROLLER_RESULT_READY,
+        content::NotificationService::AllSources());
+    autocomplete_observer.Wait();
+  }
+
+  std::string nativeSuggestionString =
+      "chrome.embeddedSearch.searchBox.nativeSuggestions";
+
+  int nativeSuggestionsLength;
+  EXPECT_TRUE(
+      GetIntFromJS(overlay, nativeSuggestionString + ".length",
+          &nativeSuggestionsLength));
+  for (int i = 0; i < nativeSuggestionsLength; ++i) {
+    std::string nativeSuggestionsAtIndex =
+        nativeSuggestionString + "[" + base::IntToString(i) + "]";
+
+    bool isSearchPropertyExists;
+    EXPECT_TRUE(GetBoolFromJS(overlay, nativeSuggestionsAtIndex +
+        ".hasOwnProperty('is_search')", &isSearchPropertyExists));
+
+    // Verify that if this is a search suggestion the type is not navsuggest.
+    if (isSearchPropertyExists) {
+      bool is_search;
+      EXPECT_TRUE(GetBoolFromJS(
+          overlay, nativeSuggestionsAtIndex + ".is_search", &is_search));
+
+      std::string type;
+      EXPECT_TRUE(
+          GetStringFromJS(overlay, nativeSuggestionsAtIndex + ".type", &type));
+      EXPECT_FALSE(is_search && type == "navsuggest");
+    }
+  }
+}
+
 // Verification of fix for BUG=176365.  Ensure that each Instant WebContents in
 // a tab uses a new BrowsingInstance, to avoid conflicts in the
 // NavigationController.
 // Flaky: http://crbug.com/177516
 IN_PROC_BROWSER_TEST_F(InstantExtendedTest, DISABLED_UnrelatedSiteInstance) {
   // Setup Instant.
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
-  FocusOmniboxAndWaitForInstantExtendedSupport();
+  FocusOmniboxAndWaitForInstantOverlayAndNTPSupport();
 
   // Check that the uncommited ntp page and uncommited overlay have unrelated
   // site instances.
   // TODO(sreeram): |ntp_| is going away, so this check can be removed in the
   // future.
   content::WebContents* overlay = instant()->GetOverlayContents();
   content::WebContents* ntp_contents = instant()->ntp_->contents();
   EXPECT_FALSE(overlay->GetSiteInstance()->IsRelatedSiteInstance(
       ntp_contents->GetSiteInstance()));
 
@@ skipping 24 matching lines @@
   scoped_refptr<content::SiteInstance> second_site_instance =
       second_active_tab->GetSiteInstance();
   EXPECT_NE(first_site_instance, second_site_instance);
   EXPECT_FALSE(first_site_instance->IsRelatedSiteInstance(
       second_site_instance));
 }
 
 // Tests that suggestions are sanity checked.
 IN_PROC_BROWSER_TEST_F(InstantExtendedTest, ValidatesSuggestions) {
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
-  FocusOmniboxAndWaitForInstantExtendedSupport();
+  FocusOmniboxAndWaitForInstantOverlayAndNTPSupport();
 
   // Do not set gray text that is not a suffix of the query.
   EXPECT_TRUE(ExecuteScript("suggestion = 'potato';"
                             "behavior = 2;"));
   ASSERT_TRUE(SetOmniboxTextAndWaitForOverlayToShow("query"));
   EXPECT_EQ(ASCIIToUTF16("query"), omnibox()->GetText());
   EXPECT_EQ(ASCIIToUTF16(""), GetGrayText());
 
   omnibox()->RevertAll();
 
@@ skipping 67 matching lines @@
   SetOmniboxText("www.example.com/");
   omnibox()->OnAfterPossibleChange();
   EXPECT_EQ(ASCIIToUTF16("www.example.com/"), omnibox()->GetText());
 }
 
 // Tests that a previous navigation suggestion is not discarded if it's not
 // stale.
 IN_PROC_BROWSER_TEST_F(InstantExtendedTest,
                        NavigationSuggestionIsNotDiscarded) {
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
-  FocusOmniboxAndWaitForInstantExtendedSupport();
+  FocusOmniboxAndWaitForInstantOverlayAndNTPSupport();
 
   // Tell the page to send a URL suggestion.
   EXPECT_TRUE(ExecuteScript("suggestion = 'http://www.example.com';"
                             "behavior = 1;"));
   ASSERT_TRUE(SetOmniboxTextAndWaitForOverlayToShow("exa"));
   EXPECT_EQ(ASCIIToUTF16("example.com"), omnibox()->GetText());
   SetOmniboxText("exam");
   EXPECT_EQ(ASCIIToUTF16("example.com"), omnibox()->GetText());
 
   // TODO(jered): Remove this after fixing OnBlur().
   omnibox()->RevertAll();
 }
 
 // TODO(dhollowa): Fix flakes.  http://crbug.com/179930.
 IN_PROC_BROWSER_TEST_F(InstantExtendedTest, DISABLED_MostVisited) {
   content::WindowedNotificationObserver observer(
       chrome::NOTIFICATION_INSTANT_SENT_MOST_VISITED_ITEMS,
       content::NotificationService::AllSources());
   // Initialize Instant.
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
-  FocusOmniboxAndWaitForInstantExtendedSupport();
+  FocusOmniboxAndWaitForInstantOverlayAndNTPSupport();
 
   // Get a handle to the NTP and the current state of the JS.
   ASSERT_NE(static_cast<InstantNTP*>(NULL), instant()->ntp());
   content::WebContents* overlay = instant()->ntp_->contents();
   EXPECT_TRUE(overlay);
   EXPECT_TRUE(UpdateSearchState(overlay));
 
   // Wait for most visited data to be ready, if necessary.
   if (on_most_visited_change_calls_ == 0) {
     observer.Wait();
@@ skipping 67 matching lines @@
   EXPECT_TRUE(UpdateSearchState(overlay));
 
   // Make sure we have the same number of items as before.
   EXPECT_EQ(most_visited_items_count_, old_most_visited_items_count);
 }
 
 IN_PROC_BROWSER_TEST_F(InstantPolicyTest, ThemeBackgroundAccess) {
   InstallThemeSource();
   ASSERT_NO_FATAL_FAILURE(InstallThemeAndVerify("theme", "camo theme"));
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
-  FocusOmniboxAndWaitForInstantExtendedSupport();
+  FocusOmniboxAndWaitForInstantOverlayAndNTPSupport();
 
   // The "Instant" New Tab should have access to chrome-search: scheme but not
   // chrome: scheme.
   ui_test_utils::NavigateToURLWithDisposition(
       browser(),
       GURL(chrome::kChromeUINewTabURL),
       NEW_FOREGROUND_TAB,
       ui_test_utils::BROWSER_TEST_WAIT_FOR_TAB);
 
   content::RenderViewHost* rvh =
@@ skipping 12 matching lines @@
 // TODO(dhollowa): Fix flakes.  http://crbug.com/179930.
 IN_PROC_BROWSER_TEST_F(InstantExtendedTest, DISABLED_FaviconAccess) {
   // Create a favicon.
   history::TopSites* top_sites = browser()->profile()->GetTopSites();
   GURL url("http://www.google.com/foo.html");
   gfx::Image thumbnail(CreateBitmap(SK_ColorWHITE));
   ThumbnailScore high_score(0.0, true, true, base::Time::Now());
   EXPECT_TRUE(top_sites->SetPageThumbnail(url, thumbnail, high_score));
 
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
-  FocusOmniboxAndWaitForInstantExtendedSupport();
+  FocusOmniboxAndWaitForInstantOverlayAndNTPSupport();
 
   // The "Instant" New Tab should have access to chrome-search: scheme but not
   // chrome: scheme.
   ui_test_utils::NavigateToURLWithDisposition(
       browser(),
       GURL(chrome::kChromeUINewTabURL),
       NEW_FOREGROUND_TAB,
       ui_test_utils::BROWSER_TEST_WAIT_FOR_TAB);
 
   content::RenderViewHost* rvh =
       browser()->tab_strip_model()->GetActiveWebContents()->GetRenderViewHost();
 
   // Get the favicons.
   const std::string chrome_favicon_url(
       "chrome://favicon/largest/http://www.google.com/foo.html");
   const std::string search_favicon_url(
       "chrome-search://favicon/largest/http://www.google.com/foo.html");
   bool loaded = false;
   ASSERT_TRUE(LoadImage(rvh, chrome_favicon_url, &loaded));
   EXPECT_FALSE(loaded) << chrome_favicon_url;
   ASSERT_TRUE(LoadImage(rvh, search_favicon_url, &loaded));
   EXPECT_TRUE(loaded) << search_favicon_url;
 }
 
 // WebUIBindings should never be enabled on ANY Instant web contents.
 IN_PROC_BROWSER_TEST_F(InstantExtendedTest, NoWebUIBindingsOnNTP) {
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
-  FocusOmniboxAndWaitForInstantExtendedSupport();
+  FocusOmniboxAndWaitForInstantOverlayAndNTPSupport();
 
   ui_test_utils::NavigateToURLWithDisposition(
       browser(),
       GURL(chrome::kChromeUINewTabURL),
       NEW_FOREGROUND_TAB,
       ui_test_utils::BROWSER_TEST_WAIT_FOR_TAB);
   const content::WebContents* tab =
       browser()->tab_strip_model()->GetActiveWebContents();
 
   // Instant-provided NTP should not have any bindings enabled.
   EXPECT_EQ(0, tab->GetRenderViewHost()->GetEnabledBindings());
 }
 
 // WebUIBindings should never be enabled on ANY Instant web contents.
 IN_PROC_BROWSER_TEST_F(InstantExtendedTest, NoWebUIBindingsOnPreview) {
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
-  FocusOmniboxAndWaitForInstantExtendedSupport();
+  FocusOmniboxAndWaitForInstantOverlayAndNTPSupport();
 
   // Typing in the omnibox shows the overlay.
   ASSERT_TRUE(SetOmniboxTextAndWaitForOverlayToShow("query"));
   EXPECT_TRUE(instant()->model()->mode().is_search_suggestions());
   content::WebContents* preview = instant()->GetOverlayContents();
   ASSERT_NE(static_cast<content::WebContents*>(NULL), preview);
 
   // Instant preview should not have any bindings enabled.
   EXPECT_EQ(0, preview->GetRenderViewHost()->GetEnabledBindings());
 }
 
 // WebUIBindings should never be enabled on ANY Instant web contents.
 IN_PROC_BROWSER_TEST_F(InstantExtendedTest, NoWebUIBindingsOnResults) {
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
-  FocusOmniboxAndWaitForInstantExtendedSupport();
+  FocusOmniboxAndWaitForInstantOverlayAndNTPSupport();
 
   // Typing in the omnibox shows the overlay.
   ASSERT_TRUE(SetOmniboxTextAndWaitForOverlayToShow("query"));
   content::WebContents* preview = instant()->GetOverlayContents();
   EXPECT_TRUE(instant()->model()->mode().is_search_suggestions());
   // Commit the search by pressing Enter.
   browser()->window()->GetLocationBar()->AcceptInput();
   EXPECT_TRUE(instant()->model()->mode().is_default());
   const content::WebContents* tab =
       browser()->tab_strip_model()->GetActiveWebContents();
@@ skipping 45 matching lines @@
 #else
 #define MAYBE_CommitWhenFocusLostInFullHeight CommitWhenFocusLostInFullHeight
 #endif
 // Test that the overlay is committed when the omnibox loses focus when it is
 // shown at 100% height.
 IN_PROC_BROWSER_TEST_F(InstantExtendedTest,
                        MAYBE_CommitWhenFocusLostInFullHeight) {
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
 
   // Focus omnibox and confirm overlay isn't shown.
-  FocusOmniboxAndWaitForInstantExtendedSupport();
+  FocusOmniboxAndWaitForInstantOverlayAndNTPSupport();
   content::WebContents* overlay = instant()->GetOverlayContents();
   EXPECT_TRUE(overlay);
   EXPECT_TRUE(instant()->model()->mode().is_default());
   EXPECT_FALSE(instant()->IsOverlayingSearchResults());
 
   // Typing in the omnibox should show the overlay.
   ASSERT_TRUE(SetOmniboxTextAndWaitForOverlayToShow("query"));
   EXPECT_TRUE(instant()->IsOverlayingSearchResults());
   EXPECT_EQ(overlay, instant()->GetOverlayContents());
 
@@ skipping 18 matching lines @@
         CommitWhenShownInFullHeightWithoutFocus
 #endif
 
 // Test that the overlay is committed when shown at 100% height without focus
 // in the omnibox.
 IN_PROC_BROWSER_TEST_F(InstantExtendedTest,
                        MAYBE_CommitWhenShownInFullHeightWithoutFocus) {
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
 
   // Focus omnibox and confirm overlay isn't shown.
-  FocusOmniboxAndWaitForInstantExtendedSupport();
+  FocusOmniboxAndWaitForInstantOverlayAndNTPSupport();
   content::WebContents* overlay = instant()->GetOverlayContents();
   EXPECT_TRUE(overlay);
   EXPECT_TRUE(instant()->model()->mode().is_default());
   EXPECT_FALSE(instant()->IsOverlayingSearchResults());
 
   // Create an observer to wait for the commit.
   content::WindowedNotificationObserver commit_observer(
       chrome::NOTIFICATION_INSTANT_COMMITTED,
       content::NotificationService::AllSources());
 
@@ skipping 32 matching lines @@
       browser()->tab_strip_model()->GetActiveWebContents();
   EXPECT_EQ(overlay, active_tab);
 }
 
 // Test that a transient entry is set properly when the overlay is committed
 // without a navigation.
 IN_PROC_BROWSER_TEST_F(InstantExtendedTest, TransientEntrySet) {
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
 
   // Focus omnibox and confirm overlay isn't shown.
-  FocusOmniboxAndWaitForInstantSupport();
+  FocusOmniboxAndWaitForInstantOverlaySupport();
   content::WebContents* overlay = instant()->GetOverlayContents();
   EXPECT_TRUE(overlay);
   EXPECT_TRUE(instant()->model()->mode().is_default());
   EXPECT_FALSE(instant()->IsOverlayingSearchResults());
 
   // Commit the overlay without triggering a navigation.
   content::WindowedNotificationObserver observer(
       chrome::NOTIFICATION_INSTANT_COMMITTED,
       content::NotificationService::AllSources());
   ASSERT_TRUE(SetOmniboxTextAndWaitForOverlayToShow("query"));
@@ skipping 15 matching lines @@
   EXPECT_NE(transient_entry->GetPageID(), committed_entry->GetPageID());
 }
 
 // Test that the a transient entry is cleared when the overlay is committed
 // with a navigation.
 // TODO(samarth) : this test fails, http://crbug.com/181070.
 IN_PROC_BROWSER_TEST_F(InstantExtendedTest, DISABLED_TransientEntryRemoved) {
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
 
   // Focus omnibox and confirm overlay isn't shown.
-  FocusOmniboxAndWaitForInstantSupport();
+  FocusOmniboxAndWaitForInstantOverlaySupport();
   content::WebContents* overlay = instant()->GetOverlayContents();
   EXPECT_TRUE(overlay);
   EXPECT_TRUE(instant()->model()->mode().is_default());
   EXPECT_FALSE(instant()->IsOverlayingSearchResults());
 
   // Create an observer to wait for the commit.
   content::WindowedNotificationObserver observer(
       chrome::NOTIFICATION_INSTANT_COMMITTED,
       content::NotificationService::AllSources());
 
@@ skipping 21 matching lines @@
 
   // The last committed entry should be the URL the page navigated to.
   const content::NavigationEntry* committed_entry =
       active_tab->GetController().GetLastCommittedEntry();
   EXPECT_TRUE(EndsWith(committed_entry->GetURL().spec(), "#q=query", true));
 }
 
 IN_PROC_BROWSER_TEST_F(InstantExtendedTest, RestrictedItemReadback) {
   // Initialize Instant.
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
-  FocusOmniboxAndWaitForInstantSupport();
+  FocusOmniboxAndWaitForInstantOverlaySupport();
 
   // Get a handle to the NTP and the current state of the JS.
   ASSERT_NE(static_cast<InstantNTP*>(NULL), instant()->ntp());
   content::WebContents* preview_tab = instant()->ntp()->contents();
   EXPECT_TRUE(preview_tab);
 
   // Manufacture a few autocomplete results and get them down to the page.
   std::vector<InstantAutocompleteResult> autocomplete_results;
   for (int i = 0; i < 3; ++i) {
     std::string description(base::StringPrintf("Test Description %d", i));
@@ skipping 52 matching lines @@
   EXPECT_TRUE(GetStringFromJS(instant()->GetOverlayContents(),
                               "apiHandle.value",
                               &result));
   EXPECT_EQ(kQueryString, result);
 }
 
 // Test that autocomplete results are sent to the page only when all the
 // providers are done.
 IN_PROC_BROWSER_TEST_F(InstantExtendedTest, AutocompleteProvidersDone) {
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
-  FocusOmniboxAndWaitForInstantExtendedSupport();
+  FocusOmniboxAndWaitForInstantOverlayAndNTPSupport();
 
   content::WebContents* overlay = instant()->GetOverlayContents();
   EXPECT_TRUE(UpdateSearchState(overlay));
   EXPECT_EQ(0, on_native_suggestions_calls_);
 
   ASSERT_TRUE(SetOmniboxTextAndWaitForOverlayToShow("railroad"));
 
   EXPECT_EQ(overlay, instant()->GetOverlayContents());
   EXPECT_TRUE(UpdateSearchState(overlay));
   EXPECT_EQ(1, on_native_suggestions_calls_);
@@ skipping 16 matching lines @@
 #if defined(OS_WIN) || defined(OS_CHROMEOS) || defined(OS_MACOSX)
 #define MAYBE_TopBarsVisibilityWhenSwitchingTabs \
     TopBarsVisibilityWhenSwitchingTabs
 #else
 #define MAYBE_TopBarsVisibilityWhenSwitchingTabs \
     DISABLED_TopBarsVisibilityWhenSwitchingTabs
 #endif
 IN_PROC_BROWSER_TEST_F(InstantExtendedTest,
                        MAYBE_TopBarsVisibilityWhenSwitchingTabs) {
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
-  FocusOmniboxAndWaitForInstantExtendedSupport();
+  FocusOmniboxAndWaitForInstantOverlayAndNTPSupport();
 
   // Open 2 tabs of |DFEAULT| mode.
   ui_test_utils::NavigateToURLWithDisposition(
       browser(),
       GURL("http://www.example.com"),
       CURRENT_TAB,
       ui_test_utils::BROWSER_TEST_NONE);
   ui_test_utils::NavigateToURLWithDisposition(
       browser(),
       GURL("http://www.example.com"),
@@ skipping 69 matching lines @@
        !found_bookmark_match && iter != result.end(); ++iter) {
     found_bookmark_match = iter->type == AutocompleteMatch::BOOKMARK_TITLE;
   }
 
   EXPECT_TRUE(found_bookmark_match);
 }
 
 // Test that the omnibox's temporary text is reset when the popup is closed.
 IN_PROC_BROWSER_TEST_F(InstantExtendedTest, TemporaryTextResetWhenPopupClosed) {
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
-  FocusOmniboxAndWaitForInstantExtendedSupport();
+  FocusOmniboxAndWaitForInstantOverlayAndNTPSupport();
   EXPECT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser()));
 
   // Show the overlay and arrow-down to a suggestion (this sets temporary text).
   ASSERT_TRUE(SetOmniboxTextAndWaitForOverlayToShow("juju"));
   SendDownArrow();
 
   EXPECT_TRUE(HasTemporaryText());
   EXPECT_EQ("result 1", GetOmniboxText());
 
   // Click outside the omnibox (but not on the overlay), to make the omnibox
@@ skipping 11 matching lines @@
 
   // The omnibox should've reverted to the underlying permanent URL.
   EXPECT_FALSE(HasTemporaryText());
   EXPECT_EQ(std::string(chrome::kAboutBlankURL), GetOmniboxText());
 }
 
 // Test that autocomplete results aren't sent when the popup is closed.
 IN_PROC_BROWSER_TEST_F(InstantExtendedTest,
                        NoAutocompleteResultsWhenPopupClosed) {
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
-  FocusOmniboxAndWaitForInstantExtendedSupport();
+  FocusOmniboxAndWaitForInstantOverlayAndNTPSupport();
   EXPECT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser()));
 
   // Show the overlay and arrow-down to a suggestion (this sets temporary text).
   ASSERT_TRUE(SetOmniboxTextAndWaitForOverlayToShow("thangam"));
   SendDownArrow();
   EXPECT_TRUE(HasTemporaryText());
 
   EXPECT_TRUE(ExecuteScript("onChangeCalls = onNativeSuggestionsCalls = 0;"));
 
   content::WebContents* overlay = instant()->GetOverlayContents();
   EXPECT_TRUE(UpdateSearchState(overlay));
   EXPECT_EQ(0, on_change_calls_);
   EXPECT_EQ(0, on_native_suggestions_calls_);
 
   // Click outside the omnibox (but not on the overlay), to make the omnibox
   // lose focus. Close the popup explicitly, to workaround test/toolkit issues.
   ui_test_utils::ClickOnView(browser(), VIEW_ID_TOOLBAR);
   omnibox()->CloseOmniboxPopup();
   EXPECT_FALSE(HasTemporaryText());
 
   EXPECT_EQ(overlay, instant()->GetOverlayContents());
   EXPECT_TRUE(UpdateSearchState(overlay));
   EXPECT_EQ(0, on_change_calls_);
   EXPECT_EQ(0, on_native_suggestions_calls_);
 }
 
 // Test that suggestions are not accepted when unexpected.
 IN_PROC_BROWSER_TEST_F(InstantExtendedTest, DeniesUnexpectedSuggestions) {
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
-  FocusOmniboxAndWaitForInstantExtendedSupport();
+  FocusOmniboxAndWaitForInstantOverlayAndNTPSupport();
   ASSERT_TRUE(SetOmniboxTextAndWaitForOverlayToShow("chip"));
   SendDownArrow();
 
   EXPECT_EQ("result 1", GetOmniboxText());
   EXPECT_EQ(ASCIIToUTF16(""), GetGrayText());
 
   // Make the page send an unexpected suggestion.
   EXPECT_TRUE(ExecuteScript("suggestion = 'chippies';"
                             "handleOnChange();"));
 
   // Verify that the suggestion is ignored.
   EXPECT_EQ("result 1", GetOmniboxText());
   EXPECT_EQ(ASCIIToUTF16(""), GetGrayText());
 }
 
 // Test that autocomplete results are cleared when the query is cleared.
 IN_PROC_BROWSER_TEST_F(InstantExtendedTest, EmptyAutocompleteResults) {
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
-  FocusOmniboxAndWaitForInstantExtendedSupport();
+  FocusOmniboxAndWaitForInstantOverlayAndNTPSupport();
 
   // Type a URL, so that there's at least one autocomplete result (a "URL what
   // you typed" match).
   ASSERT_TRUE(SetOmniboxTextAndWaitForOverlayToShow("http://upsamina/"));
 
   content::WebContents* overlay = instant()->GetOverlayContents();
 
   int num_autocomplete_results = 0;
   EXPECT_TRUE(GetIntFromJS(
       overlay,
       "chrome.embeddedSearch.searchBox.nativeSuggestions.length",
       &num_autocomplete_results));
   EXPECT_LT(0, num_autocomplete_results);
 
   // Erase the query in the omnibox.
   SetOmniboxText("");
 
   EXPECT_TRUE(GetIntFromJS(
       overlay,
       "chrome.embeddedSearch.searchBox.nativeSuggestions.length",
       &num_autocomplete_results));
   EXPECT_EQ(0, num_autocomplete_results);
 }
 
 // Test that hitting Esc to clear the omnibox works. http://crbug.com/231744.
 IN_PROC_BROWSER_TEST_F(InstantExtendedTest, EscapeClearsOmnibox) {
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
-  FocusOmniboxAndWaitForInstantExtendedSupport();
+  FocusOmniboxAndWaitForInstantOverlayAndNTPSupport();
 
   // Navigate to the Instant NTP, and wait for it to be recognized.
   content::WindowedNotificationObserver instant_tab_observer(
       chrome::NOTIFICATION_INSTANT_TAB_SUPPORT_DETERMINED,
       content::NotificationService::AllSources());
   ui_test_utils::NavigateToURLWithDisposition(browser(),
                                               GURL(chrome::kChromeUINewTabURL),
                                               CURRENT_TAB,
                                               ui_test_utils::BROWSER_TEST_NONE);
   instant_tab_observer.Wait();
@@ skipping 15 matching lines @@
   SendEscape();
   EXPECT_TRUE(GetStringFromJS(contents, "chrome.embeddedSearch.searchBox.value",
                               &query));
   EXPECT_EQ("", query);
   EXPECT_EQ("", GetOmniboxText());
 
   EXPECT_TRUE(UpdateSearchState(contents));
   EXPECT_LT(0, on_change_calls_);
   EXPECT_EQ(0, submit_count_);
 }