InstantExtendedManualTests should fail and not hang

chrome/browser/ui/search/instant_extended_browsertest.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/utf_string_conversions.h"
@@ skipping 213 matching lines @@
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
 
   // Focus omnibox and confirm overlay isn't shown.
   FocusOmniboxAndWaitForInstantExtendedSupport();
   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.
-  SetOmniboxTextAndWaitForOverlayToShow("query");
+  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();
   EXPECT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser()));
 
   EXPECT_EQ(1, browser()->tab_strip_model()->count());
 
   // Typing in the omnibox should show the overlay.
-  SetOmniboxTextAndWaitForOverlayToShow("http://www.example.com/");
+  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;"
       "document.body.addEventListener('click', function() {"
         "chrome.embeddedSearch.navigateContentWindow(rid, 2);"
       "});"
       ));
 
   content::WindowedNotificationObserver observer(
@@ skipping 16 matching lines @@
 }
 
 IN_PROC_BROWSER_TEST_F(InstantExtendedTest,
                        UnfocusingOmniboxDoesNotChangeSuggestions) {
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
   FocusOmniboxAndWaitForInstantExtendedSupport();
   EXPECT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser()));
 
   // Get a committed tab to work with.
   content::WebContents* instant_tab = instant()->GetOverlayContents();
-  SetOmniboxTextAndWaitForOverlayToShow("committed");
+  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();
 
   // 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.
-  SetOmniboxTextAndWaitForOverlayToShow("santa");
+  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();
 
   // Set autocomplete text (grey text).
   EXPECT_TRUE(ExecuteScript("suggestion = 'johnny depp';"));
 
   // Set the text, and wait for suggestions to show up.
-  SetOmniboxTextAndWaitForOverlayToShow("johnny");
+  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();
 
   // 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.
-  SetOmniboxTextAndWaitForOverlayToShow("hello k");
+  ASSERT_TRUE(SetOmniboxTextAndWaitForOverlayToShow("hello k"));
   EXPECT_EQ(ASCIIToUTF16("hello k"), omnibox()->GetText());
   browser()->window()->GetLocationBar()->AcceptInput();
   observer.Wait();
 
   // With a committed results page, do a search by unfocusing the omnibox and
   // focusing the contents.
   SetOmniboxText("hello");
   // Calling handleOnChange manually to make sure it is called before the
   // Focus() call below.
   EXPECT_TRUE(content::ExecuteScript(instant()->instant_tab()->contents(),
@@ skipping 10 matching lines @@
 // suggestion comes in.
 IN_PROC_BROWSER_TEST_F(InstantExtendedTest,
                        NavigationSuggestionIsDiscardedUponSearchSuggestion) {
   // Setup Instant.
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
   FocusOmniboxAndWaitForInstantExtendedSupport();
 
   // Tell the page to send a URL suggestion.
   EXPECT_TRUE(ExecuteScript("suggestion = 'http://www.example.com';"
                             "behavior = 1;"));
-  SetOmniboxTextAndWaitForOverlayToShow("exa");
+  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();
 
-  SetOmniboxTextAndWaitForOverlayToShow("hello");
+  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());
   SendUpArrow();
   EXPECT_EQ("hello", GetOmniboxText());
@@ skipping 24 matching lines @@
                        NavigateToURLSuggestionHitEnterAndLookForSubmit) {
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
   FocusOmniboxAndWaitForInstantExtendedSupport();
 
   // 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.
-  SetOmniboxTextAndWaitForOverlayToShow("hello k");
+  ASSERT_TRUE(SetOmniboxTextAndWaitForOverlayToShow("hello k"));
   EXPECT_EQ(ASCIIToUTF16("hello k"), omnibox()->GetText());
   browser()->window()->GetLocationBar()->AcceptInput();
   observer.Wait();
 
   SetOmniboxText("http");
   EXPECT_EQ("http", GetOmniboxText());
 
   SendDownArrow();
   EXPECT_EQ("result 1", GetOmniboxText());
   SendDownArrow();
@@ skipping 18 matching lines @@
   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();
 
-  SetOmniboxTextAndWaitForOverlayToShow("hello");
+  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.
@@ skipping 12 matching lines @@
 }
 
 IN_PROC_BROWSER_TEST_F(InstantExtendedTest, PressEscapeWithBlueText) {
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
   FocusOmniboxAndWaitForInstantExtendedSupport();
 
   // Set blue text completion.
   EXPECT_TRUE(ExecuteScript("suggestion = 'chimichanga.com';"
                             "behavior = 1;"));
 
-  SetOmniboxTextAndWaitForOverlayToShow("chimi");
+  ASSERT_TRUE(SetOmniboxTextAndWaitForOverlayToShow("chimi"));
 
   EXPECT_EQ(ASCIIToUTF16("chimichanga.com"), omnibox()->GetText());
   EXPECT_EQ(ASCIIToUTF16("changa.com"), GetBlueText());
   EXPECT_EQ(ASCIIToUTF16(""), GetGrayText());
 
   EXPECT_TRUE(ExecuteScript("onChangeCalls = onNativeSuggestionsCalls = 0;"));
 
   SendDownArrow();
 
   EXPECT_EQ(ASCIIToUTF16("result 1"), omnibox()->GetText());
@@ skipping 16 matching lines @@
 }
 
 IN_PROC_BROWSER_TEST_F(InstantExtendedTest, PressEscapeWithGrayText) {
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
   FocusOmniboxAndWaitForInstantExtendedSupport();
 
   // Set gray text completion.
   EXPECT_TRUE(ExecuteScript("suggestion = 'cowabunga';"
                             "behavior = 2;"));
 
-  SetOmniboxTextAndWaitForOverlayToShow("cowa");
+  ASSERT_TRUE(SetOmniboxTextAndWaitForOverlayToShow("cowa"));
 
   EXPECT_EQ(ASCIIToUTF16("cowa"), omnibox()->GetText());
   EXPECT_EQ(ASCIIToUTF16(""), GetBlueText());
   EXPECT_EQ(ASCIIToUTF16("bunga"), GetGrayText());
 
   EXPECT_TRUE(ExecuteScript("onChangeCalls = onNativeSuggestionsCalls = 0;"));
 
   SendDownArrow();
 
   EXPECT_EQ(ASCIIToUTF16("result 1"), omnibox()->GetText());
@@ skipping 237 matching lines @@
   // 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()));
 
   // Type a query and hit enter to get a results page.  The overlay becomes the
   // active tab.
-  SetOmniboxTextAndWaitForOverlayToShow("hello");
+  ASSERT_TRUE(SetOmniboxTextAndWaitForOverlayToShow("hello"));
   EXPECT_EQ("hello", GetOmniboxText());
   browser()->window()->GetLocationBar()->AcceptInput();
   content::WebContents* first_active_tab =
       browser()->tab_strip_model()->GetActiveWebContents();
   EXPECT_EQ(first_active_tab, overlay);
   scoped_refptr<content::SiteInstance> first_site_instance =
       first_active_tab->GetSiteInstance();
   EXPECT_FALSE(first_site_instance->IsRelatedSiteInstance(
       ntp_contents->GetSiteInstance()));
 
   // Navigating elsewhere gets us off of the commited page.  The next
   // query will give us a new |overlay| which we will then commit.
   ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUIAboutURL));
 
   // Show and commit the new overlay.
-  SetOmniboxTextAndWaitForOverlayToShow("hello again");
+  ASSERT_TRUE(SetOmniboxTextAndWaitForOverlayToShow("hello again"));
   EXPECT_EQ("hello again", GetOmniboxText());
   browser()->window()->GetLocationBar()->AcceptInput();
   content::WebContents* second_active_tab =
       browser()->tab_strip_model()->GetActiveWebContents();
   EXPECT_NE(first_active_tab, second_active_tab);
   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();
 
   // Do not set gray text that is not a suffix of the query.
   EXPECT_TRUE(ExecuteScript("suggestion = 'potato';"
                             "behavior = 2;"));
-  SetOmniboxTextAndWaitForOverlayToShow("query");
+  ASSERT_TRUE(SetOmniboxTextAndWaitForOverlayToShow("query"));
   EXPECT_EQ(ASCIIToUTF16("query"), omnibox()->GetText());
   EXPECT_EQ(ASCIIToUTF16(""), GetGrayText());
 
   omnibox()->RevertAll();
 
   // Do not set blue text that is not a valid URL completion.
   EXPECT_TRUE(ExecuteScript("suggestion = 'this is not a url!';"
                             "behavior = 1;"));
-  SetOmniboxTextAndWaitForOverlayToShow("this is");
+  ASSERT_TRUE(SetOmniboxTextAndWaitForOverlayToShow("this is"));
   EXPECT_EQ(ASCIIToUTF16("this is"), omnibox()->GetText());
   EXPECT_EQ(ASCIIToUTF16(""), GetGrayText());
 
   omnibox()->RevertAll();
 
   // Do not set gray text when blue text is already set.
   // First set up some blue text completion.
   EXPECT_TRUE(ExecuteScript("suggestion = 'www.example.com';"
                             "behavior = 1;"));
-  SetOmniboxTextAndWaitForOverlayToShow("http://www.ex");
+  ASSERT_TRUE(SetOmniboxTextAndWaitForOverlayToShow("http://www.ex"));
   EXPECT_EQ(ASCIIToUTF16("http://www.example.com"), omnibox()->GetText());
   EXPECT_EQ(ASCIIToUTF16("ample.com"), GetBlueText());
 
   // Now try to set gray text for the same query.
   EXPECT_TRUE(ExecuteScript("suggestion = 'www.example.com rocks';"
                             "behavior = 2;"));
   SetOmniboxText("http://www.ex");
   EXPECT_EQ(ASCIIToUTF16("http://www.example.com"), omnibox()->GetText());
   EXPECT_EQ(ASCIIToUTF16(""), GetGrayText());
 
   omnibox()->RevertAll();
 
   // Ignore an out-of-date blue text suggestion. (Simulates a laggy
   // SetSuggestion IPC by directly calling into InstantController.)
-  SetOmniboxTextAndWaitForOverlayToShow("http://www.example.com/");
+  ASSERT_TRUE(SetOmniboxTextAndWaitForOverlayToShow("http://www.example.com/"));
   instant()->SetSuggestions(
       instant()->overlay()->contents(),
       std::vector<InstantSuggestion>(
           1,
           InstantSuggestion(ASCIIToUTF16("www.exa"),
                             INSTANT_COMPLETE_NOW,
                             INSTANT_SUGGESTION_URL,
                             ASCIIToUTF16("www.exa"))));
   EXPECT_EQ(
       "http://www.example.com/",
       omnibox()->model()->result().default_match()->destination_url.spec());
 
   omnibox()->RevertAll();
 
   // TODO(samarth): uncomment after fixing crbug.com/191656.
   // Use an out-of-date blue text suggestion, if the text typed by the user is
   // contained in the suggestion.
-  // SetOmniboxTextAndWaitForOverlayToShow("ex");
+  // ASSERT_TRUE(SetOmniboxTextAndWaitForOverlayToShow("ex"));
   // instant()->SetSuggestions(
   //     instant()->overlay()->contents(),
   //     std::vector<InstantSuggestion>(
   //         1,
   //         InstantSuggestion(ASCIIToUTF16("www.example.com"),
   //                           INSTANT_COMPLETE_NOW,
   //                           INSTANT_SUGGESTION_URL,
   //                           ASCIIToUTF16("e"))));
   // EXPECT_EQ(
   //     "http://www.example.com/",
@@ skipping 15 matching lines @@
 // 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();
 
   // Tell the page to send a URL suggestion.
   EXPECT_TRUE(ExecuteScript("suggestion = 'http://www.example.com';"
                             "behavior = 1;"));
-  SetOmniboxTextAndWaitForOverlayToShow("exa");
+  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) {
@@ skipping 164 matching lines @@
   // 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();
 
   // Typing in the omnibox shows the overlay.
-  SetOmniboxTextAndWaitForOverlayToShow("query");
+  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();
 
   // Typing in the omnibox shows the overlay.
-  SetOmniboxTextAndWaitForOverlayToShow("query");
+  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();
   EXPECT_EQ(preview, tab);
 
   // The commited Instant page should not have any bindings enabled.
@@ skipping 49 matching lines @@
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
 
   // Focus omnibox and confirm overlay isn't shown.
   FocusOmniboxAndWaitForInstantExtendedSupport();
   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.
-  SetOmniboxTextAndWaitForOverlayToShow("query");
+  ASSERT_TRUE(SetOmniboxTextAndWaitForOverlayToShow("query"));
   EXPECT_TRUE(instant()->IsOverlayingSearchResults());
   EXPECT_EQ(overlay, instant()->GetOverlayContents());
 
   // Explicitly unfocus the omnibox without triggering a click. Note that this
   // doesn't actually change the focus state of the omnibox, only what the
   // Instant controller sees it as.
   omnibox()->model()->OnWillKillFocus(NULL);
   omnibox()->model()->OnKillFocus();
 
   // Confirm that the overlay has been committed.
@@ skipping 74 matching lines @@
   FocusOmniboxAndWaitForInstantSupport();
   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());
-  SetOmniboxTextAndWaitForOverlayToShow("query");
+  ASSERT_TRUE(SetOmniboxTextAndWaitForOverlayToShow("query"));
   browser()->window()->GetLocationBar()->AcceptInput();
   observer.Wait();
 
   // Confirm that the overlay has been committed.
   content::WebContents* active_tab =
       browser()->tab_strip_model()->GetActiveWebContents();
   EXPECT_EQ(overlay, active_tab);
 
   // The page hasn't navigated so there should be a transient entry with the
   // same URL but different page ID as the last committed entry.
@@ skipping 24 matching lines @@
       content::NotificationService::AllSources());
 
   // Trigger a navigation on commit.
   EXPECT_TRUE(ExecuteScript(
       "getApiHandle().oncancel = function() {"
       "  location.replace(location.href + '#q=query');"
       "};"
       ));
 
   // Commit the overlay.
-  SetOmniboxTextAndWaitForOverlayToShow("query");
+  ASSERT_TRUE(SetOmniboxTextAndWaitForOverlayToShow("query"));
   browser()->window()->GetLocationBar()->AcceptInput();
   observer.Wait();
 
   // Confirm that the overlay has been committed.
   content::WebContents* active_tab =
       browser()->tab_strip_model()->GetActiveWebContents();
   EXPECT_EQ(overlay, active_tab);
 
   // The page has navigated so there should be no transient entry.
   const content::NavigationEntry* transient_entry =
@@ skipping 81 matching lines @@
 // 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();
 
   content::WebContents* overlay = instant()->GetOverlayContents();
   EXPECT_TRUE(UpdateSearchState(overlay));
   EXPECT_EQ(0, on_native_suggestions_calls_);
 
-  SetOmniboxTextAndWaitForOverlayToShow("railroad");
+  ASSERT_TRUE(SetOmniboxTextAndWaitForOverlayToShow("railroad"));
 
   EXPECT_EQ(overlay, instant()->GetOverlayContents());
   EXPECT_TRUE(UpdateSearchState(overlay));
   EXPECT_EQ(1, on_native_suggestions_calls_);
 }
 
 // Test that the local NTP doesn't end up with the local overlay's URL.
 IN_PROC_BROWSER_TEST_F(InstantExtendedTest, LocalNTPIsNotLocalOverlay) {
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
 
@@ skipping 42 matching lines @@
   EXPECT_TRUE(tab1_helper->model()->top_bars_visible());
 
   // Select 1st tab and type in omnibox.  We really want a partial-height
   // overlay, so that it doesn't get committed when switching away from this
   // tab.  However, the instant_extended.html used for tests always shows at
   // full height, though it doesn't commit the overlay when the omnibox text is
   // a URL and not a search.  So we specifically set a URL as the omnibox text.
   // The overlay showing will trigger top bars in 1st tab to be hidden, but keep
   // 2nd tab's visible.
   browser()->tab_strip_model()->ActivateTabAt(0, true);
-  SetOmniboxTextAndWaitForOverlayToShow("http://www.example.com/");
+  ASSERT_TRUE(SetOmniboxTextAndWaitForOverlayToShow("http://www.example.com/"));
   EXPECT_FALSE(tab0_helper->model()->top_bars_visible());
   EXPECT_TRUE(tab1_helper->model()->top_bars_visible());
 
   // Select 2nd tab, top bars of 1st tab should become visible, because its
   // overlay has been hidden.
   browser()->tab_strip_model()->ActivateTabAt(1, true);
   EXPECT_TRUE(tab0_helper->model()->top_bars_visible());
   EXPECT_TRUE(tab1_helper->model()->top_bars_visible());
 
   // Select back 1st tab, top bars visibility of both tabs should be the same
   // as before.
   browser()->tab_strip_model()->ActivateTabAt(0, true);
   EXPECT_TRUE(tab0_helper->model()->top_bars_visible());
   EXPECT_TRUE(tab1_helper->model()->top_bars_visible());
 
   // Type in omnibox to trigger full-height overlay, which will trigger its top
   // bars to be hidden, but keep 2nd tab's visible.
-  SetOmniboxTextAndWaitForOverlayToShow("query");
+  ASSERT_TRUE(SetOmniboxTextAndWaitForOverlayToShow("query"));
   EXPECT_FALSE(tab0_helper->model()->top_bars_visible());
   EXPECT_TRUE(tab1_helper->model()->top_bars_visible());
 
   // Select 2nd tab, its top bars should show, but top bars for 1st tab should
   // remain hidden, because the committed full-height overlay is still showing
   // suggestions.
   browser()->tab_strip_model()->ActivateTabAt(1, true);
   EXPECT_FALSE(tab0_helper->model()->top_bars_visible());
   EXPECT_TRUE(tab1_helper->model()->top_bars_visible());
 }
@@ skipping 24 matching lines @@
   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();
   EXPECT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser()));
 
   // Show the overlay and arrow-down to a suggestion (this sets temporary text).
-  SetOmniboxTextAndWaitForOverlayToShow("juju");
+  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
   // lose focus. Close the popup explicitly, to workaround test/toolkit issues.
   ui_test_utils::ClickOnView(browser(), VIEW_ID_TOOLBAR);
   omnibox()->CloseOmniboxPopup();
 
@@ skipping 11 matching lines @@
 }
 
 // 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();
   EXPECT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser()));
 
   // Show the overlay and arrow-down to a suggestion (this sets temporary text).
-  SetOmniboxTextAndWaitForOverlayToShow("thangam");
+  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();
-  SetOmniboxTextAndWaitForOverlayToShow("chip");
+  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();
 
   // Type a URL, so that there's at least one autocomplete result (a "URL what
   // you typed" match).
-  SetOmniboxTextAndWaitForOverlayToShow("http://upsamina/");
+  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);
 
@@ skipping 39 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_);
 }