InstantExtendedManualTests should fail and not hang

chrome/browser/ui/search/instant_browsertest.cc

 // Copyright 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 "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/history/history_service_factory.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_engines/template_url_service.h"
@@ skipping 84 matching lines @@
   // Unfocusing and refocusing the omnibox should also preserve the overlay.
   ui_test_utils::ClickOnView(browser(), VIEW_ID_TAB_CONTAINER);
   EXPECT_TRUE(ui_test_utils::IsViewFocused(browser(), VIEW_ID_TAB_CONTAINER));
 
   FocusOmnibox();
   EXPECT_FALSE(ui_test_utils::IsViewFocused(browser(), VIEW_ID_TAB_CONTAINER));
 
   EXPECT_EQ(overlay, instant()->GetOverlayContents());
 
   // Doing a search should also use the same preloaded page.
-  SetOmniboxTextAndWaitForOverlayToShow("query");
+  ASSERT_TRUE(SetOmniboxTextAndWaitForOverlayToShow("query"));
   EXPECT_TRUE(instant()->model()->mode().is_search_suggestions());
   EXPECT_EQ(overlay, instant()->GetOverlayContents());
 }
 
 // Flakes on Windows and Mac: http://crbug.com/170677
 #if defined(OS_WIN) || defined(OS_MACOSX)
 #define MAYBE_OnChangeEvent DISABLED_OnChangeEvent
 #else
 #define MAYBE_OnChangeEvent OnChangeEvent
 #endif
 // Test that the onchange event is dispatched upon typing in the omnibox.
 IN_PROC_BROWSER_TEST_F(InstantTest, MAYBE_OnChangeEvent) {
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
   FocusOmniboxAndWaitForInstantSupport();
 
   // Use the Instant page as the active tab, so we can exploit its visibility
   // handler to check visibility transitions.
   ui_test_utils::NavigateToURL(browser(), instant_url());
   content::WebContents* active_tab =
       browser()->tab_strip_model()->GetActiveWebContents();
 
   int active_tab_onvisibilitycalls = -1;
   EXPECT_TRUE(GetIntFromJS(active_tab, "onvisibilitycalls",
                            &active_tab_onvisibilitycalls));
   EXPECT_EQ(0, active_tab_onvisibilitycalls);
 
   // Typing "query" into the omnibox causes one or more onchange events. The
   // page suggested "query suggestion" is inline autocompleted into the omnibox,
   // causing another onchange event.
-  SetOmniboxTextAndWaitForOverlayToShow("query");
+  ASSERT_TRUE(SetOmniboxTextAndWaitForOverlayToShow("query"));
   EXPECT_EQ(ASCIIToUTF16("query suggestion"), omnibox()->GetText());
   int min_onchangecalls = 2;
 
   EXPECT_TRUE(UpdateSearchState(instant()->GetOverlayContents()));
   EXPECT_LE(min_onchangecalls, onchangecalls_);
   min_onchangecalls = onchangecalls_;
 
   // Change the query and confirm more onchange events are sent.
   SetOmniboxText("search");
   ++min_onchangecalls;
@@ skipping 67 matching lines @@
   EXPECT_TRUE(verbatim_);
   EXPECT_EQ(1, onsubmitcalls_);
   EXPECT_EQ(1, onvisibilitycalls_);
 }
 
 // Test that the oncancel event is dispatched upon clicking on the overlay.
 IN_PROC_BROWSER_TEST_F(InstantTest, OnCancelEvent) {
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
   EXPECT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser()));
   FocusOmniboxAndWaitForInstantSupport();
-  SetOmniboxTextAndWaitForOverlayToShow("search");
+  ASSERT_TRUE(SetOmniboxTextAndWaitForOverlayToShow("search"));
 
   // Stash a reference to the overlay, so we can refer to it after commit.
   content::WebContents* overlay = instant()->GetOverlayContents();
   EXPECT_TRUE(overlay);
 
   // The state of the searchbox before the commit.
   EXPECT_TRUE(UpdateSearchState(overlay));
   EXPECT_EQ("search", value_);
   EXPECT_FALSE(verbatim_);
   EXPECT_EQ(0, oncancelcalls_);
@@ skipping 47 matching lines @@
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
 
   FocusOmniboxAndWaitForInstantSupport();
 
   EXPECT_TRUE(UpdateSearchState(instant()->GetOverlayContents()));
   EXPECT_EQ(0, onresizecalls_);
   EXPECT_EQ(0, height_);
 
   // Type a query into the omnibox. This should cause an onresize() event, with
   // a valid (non-zero) height.
-  SetOmniboxTextAndWaitForOverlayToShow("search");
+  ASSERT_TRUE(SetOmniboxTextAndWaitForOverlayToShow("search"));
 
   EXPECT_TRUE(UpdateSearchState(instant()->GetOverlayContents()));
   EXPECT_EQ(1, onresizecalls_);
   EXPECT_LT(0, height_);
 }
 
 // Test that the INSTANT_COMPLETE_NOW behavior works as expected.
 IN_PROC_BROWSER_TEST_F(InstantTest, SuggestionIsCompletedNow) {
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
   FocusOmniboxAndWaitForInstantSupport();
 
   // Tell the JS to request the given behavior.
   EXPECT_TRUE(ExecuteScript("behavior = 'now'"));
 
   // Type a query, causing the hardcoded "query suggestion" to be returned.
-  SetOmniboxTextAndWaitForOverlayToShow("query");
+  ASSERT_TRUE(SetOmniboxTextAndWaitForOverlayToShow("query"));
 
   // Get what's showing in the omnibox, and what's highlighted.
   EXPECT_EQ(ASCIIToUTF16("query suggestion"), omnibox()->GetText());
   EXPECT_EQ(ASCIIToUTF16(" suggestion"), GetBlueText());
   EXPECT_EQ(ASCIIToUTF16(""), GetGrayText());
 }
 
 // Test that the INSTANT_COMPLETE_NEVER behavior works as expected.
 IN_PROC_BROWSER_TEST_F(InstantTest, SuggestionIsCompletedNever) {
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
   FocusOmniboxAndWaitForInstantSupport();
 
   // Tell the JS to request the given behavior.
   EXPECT_TRUE(ExecuteScript("behavior = 'never'"));
 
   // Type a query, causing the hardcoded "query suggestion" to be returned.
-  SetOmniboxTextAndWaitForOverlayToShow("query");
+  ASSERT_TRUE(SetOmniboxTextAndWaitForOverlayToShow("query"));
 
   // Get what's showing in the omnibox, and what's highlighted.
   EXPECT_EQ(ASCIIToUTF16("query"), omnibox()->GetText());
   EXPECT_EQ(ASCIIToUTF16(""), GetBlueText());
   EXPECT_EQ(ASCIIToUTF16(" suggestion"), GetGrayText());
 }
 
 // Test that a valid suggestion is accepted.
 IN_PROC_BROWSER_TEST_F(InstantTest, SuggestionIsValidObject) {
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
   FocusOmniboxAndWaitForInstantSupport();
 
   // Tell the JS to use the given suggestion.
   EXPECT_TRUE(ExecuteScript("suggestion = [ { value: 'query completion' } ]"));
 
   // Type a query, causing "query completion" to be returned as the suggestion.
-  SetOmniboxTextAndWaitForOverlayToShow("query");
+  ASSERT_TRUE(SetOmniboxTextAndWaitForOverlayToShow("query"));
   EXPECT_EQ(ASCIIToUTF16("query completion"), omnibox()->GetText());
 }
 
 // Test that an invalid suggestion is rejected.
 IN_PROC_BROWSER_TEST_F(InstantTest, SuggestionIsInvalidObject) {
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
   FocusOmniboxAndWaitForInstantSupport();
 
   // Tell the JS to use an object in an invalid format.
   EXPECT_TRUE(ExecuteScript("suggestion = { value: 'query completion' }"));
 
   // Type a query, but expect no suggestion.
-  SetOmniboxTextAndWaitForOverlayToShow("query");
+  ASSERT_TRUE(SetOmniboxTextAndWaitForOverlayToShow("query"));
   EXPECT_EQ(ASCIIToUTF16("query"), omnibox()->GetText());
 }
 
 // Test that various forms of empty suggestions are rejected.
 IN_PROC_BROWSER_TEST_F(InstantTest, SuggestionIsEmpty) {
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
   FocusOmniboxAndWaitForInstantSupport();
 
   EXPECT_TRUE(ExecuteScript("suggestion = {}"));
-  SetOmniboxTextAndWaitForOverlayToShow("query");
+  ASSERT_TRUE(SetOmniboxTextAndWaitForOverlayToShow("query"));
   EXPECT_EQ(ASCIIToUTF16("query"), omnibox()->GetText());
 
   omnibox()->RevertAll();
 
   EXPECT_TRUE(ExecuteScript("suggestion = []"));
-  SetOmniboxTextAndWaitForOverlayToShow("query sugg");
+  ASSERT_TRUE(SetOmniboxTextAndWaitForOverlayToShow("query sugg"));
   EXPECT_EQ(ASCIIToUTF16("query sugg"), omnibox()->GetText());
 
   omnibox()->RevertAll();
 
   EXPECT_TRUE(ExecuteScript("suggestion = [{}]"));
-  SetOmniboxTextAndWaitForOverlayToShow("query suggest");
+  ASSERT_TRUE(SetOmniboxTextAndWaitForOverlayToShow("query suggest"));
   EXPECT_EQ(ASCIIToUTF16("query suggest"), omnibox()->GetText());
 }
 
 // Tests that a previous search suggestion is not discarded if it's not stale.
 IN_PROC_BROWSER_TEST_F(InstantTest, SearchSuggestionIsNotDiscarded) {
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
   FocusOmniboxAndWaitForInstantSupport();
 
-  SetOmniboxTextAndWaitForOverlayToShow("query");
+  ASSERT_TRUE(SetOmniboxTextAndWaitForOverlayToShow("query"));
   EXPECT_EQ(ASCIIToUTF16("query suggestion"), omnibox()->GetText());
   SetOmniboxText("query sugg");
   EXPECT_EQ(ASCIIToUTF16("query suggestion"), omnibox()->GetText());
 }
 
 // Test that Instant doesn't process URLs.
 IN_PROC_BROWSER_TEST_F(InstantTest, RejectsURLs) {
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
   FocusOmniboxAndWaitForInstantSupport();
 
@@ skipping 47 matching lines @@
   int min_onchangecalls = 2;
 
   EXPECT_TRUE(UpdateSearchState(instant()->GetOverlayContents()));
   EXPECT_FALSE(instant()->IsOverlayingSearchResults());
   EXPECT_TRUE(instant()->model()->mode().is_default());
   EXPECT_EQ("", value_);
   EXPECT_LE(min_onchangecalls, onchangecalls_);
   min_onchangecalls = onchangecalls_;
 
   // Type a search. Instant should show.
-  SetOmniboxTextAndWaitForOverlayToShow("search");
+  ASSERT_TRUE(SetOmniboxTextAndWaitForOverlayToShow("search"));
   ++min_onchangecalls;
 
   EXPECT_TRUE(UpdateSearchState(instant()->GetOverlayContents()));
   EXPECT_TRUE(instant()->IsOverlayingSearchResults());
   EXPECT_TRUE(instant()->model()->mode().is_search_suggestions());
   EXPECT_EQ("search", value_);
   EXPECT_LE(min_onchangecalls, onchangecalls_);
   min_onchangecalls = onchangecalls_;
 
   // Type another URL. The overlay should be hidden.
   SetOmniboxText("http://terrible/terror");
   ++min_onchangecalls;
 
   EXPECT_TRUE(UpdateSearchState(instant()->GetOverlayContents()));
   EXPECT_FALSE(instant()->IsOverlayingSearchResults());
   EXPECT_TRUE(instant()->model()->mode().is_default());
   EXPECT_EQ("", value_);
   EXPECT_LE(min_onchangecalls, onchangecalls_);
   min_onchangecalls = onchangecalls_;
 
   // Type the same search as before.
-  SetOmniboxTextAndWaitForOverlayToShow("search");
+  ASSERT_TRUE(SetOmniboxTextAndWaitForOverlayToShow("search"));
   min_onchangecalls++;
 
   EXPECT_TRUE(UpdateSearchState(instant()->GetOverlayContents()));
   EXPECT_TRUE(instant()->IsOverlayingSearchResults());
   EXPECT_TRUE(instant()->model()->mode().is_search_suggestions());
   EXPECT_EQ("search", value_);
   EXPECT_LE(min_onchangecalls, onchangecalls_);
   min_onchangecalls = onchangecalls_;
 
   // Revert the omnibox.
@@ skipping 42 matching lines @@
   EXPECT_FALSE(instant()->IsOverlayingSearchResults());
   EXPECT_TRUE(instant()->model()->mode().is_default());
 }
 
 // Test that Instant can't be fooled into committing a URL.
 IN_PROC_BROWSER_TEST_F(InstantTest, DoesNotCommitURLsTwo) {
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
   FocusOmniboxAndWaitForInstantSupport();
 
   // Type a query. This causes the overlay to be shown.
-  SetOmniboxTextAndWaitForOverlayToShow("query");
+  ASSERT_TRUE(SetOmniboxTextAndWaitForOverlayToShow("query"));
 
   content::WebContents* overlay = instant()->GetOverlayContents();
   EXPECT_TRUE(overlay);
 
   // Type a URL. This causes the overlay to be hidden.
   SetOmniboxText("http://hideous/zippleback");
   EXPECT_FALSE(instant()->IsOverlayingSearchResults());
   EXPECT_TRUE(instant()->model()->mode().is_default());
 
   // Pretend the omnibox got focus. It already had focus, so we are just trying
@@ skipping 46 matching lines @@
 
   content::WebContents* active_tab =
       browser()->tab_strip_model()->GetActiveWebContents();
   content::WebContents* overlay = instant()->GetOverlayContents();
 
   // Inititally, the active tab is showing; the overlay is not.
   EXPECT_TRUE(CheckVisibilityIs(active_tab, true));
   EXPECT_TRUE(CheckVisibilityIs(overlay, false));
 
   // Type a query and wait for Instant to show.
-  SetOmniboxTextAndWaitForOverlayToShow("query");
+  ASSERT_TRUE(SetOmniboxTextAndWaitForOverlayToShow("query"));
   EXPECT_TRUE(CheckVisibilityIs(active_tab, true));
   EXPECT_TRUE(CheckVisibilityIs(overlay, true));
 
   // Deleting the omnibox text should hide the overlay.
   SetOmniboxText(std::string());
   EXPECT_TRUE(CheckVisibilityIs(active_tab, true));
   EXPECT_TRUE(CheckVisibilityIs(overlay, false));
 
   // Typing a query should show the overlay again.
-  SetOmniboxTextAndWaitForOverlayToShow("query");
+  ASSERT_TRUE(SetOmniboxTextAndWaitForOverlayToShow("query"));
   EXPECT_TRUE(CheckVisibilityIs(active_tab, true));
   EXPECT_TRUE(CheckVisibilityIs(overlay, true));
 
   // Commit the overlay.
   browser()->window()->GetLocationBar()->AcceptInput();
   EXPECT_EQ(overlay, browser()->tab_strip_model()->GetActiveWebContents());
   EXPECT_TRUE(CheckVisibilityIs(overlay, true));
 }
 
 // Test that the task manager identifies Instant's overlay correctly.
@@ skipping 57 matching lines @@
   // |instant_url| is the URL Instant loads. |search_url| is the fake URL we
   // enter into history for search terms extraction to work correctly.
   std::string search_url = template_url->url_ref().ReplaceSearchTerms(
       TemplateURLRef::SearchTermsArgs(ASCIIToUTF16("search")));
 
   HistoryService* history = HistoryServiceFactory::GetForProfile(
       browser()->profile(), Profile::EXPLICIT_ACCESS);
   ui_test_utils::WaitForHistoryToLoad(history);
 
   // Perform a search.
-  SetOmniboxTextAndWaitForOverlayToShow("search");
+  ASSERT_TRUE(SetOmniboxTextAndWaitForOverlayToShow("search"));
 
   // Commit the search.
   browser()->window()->GetLocationBar()->AcceptInput();
 
   bool found = false;
   CancelableRequestConsumer consumer;
 
   // The fake search URL should be in history.
   base::RunLoop run_loop1;
   history->QueryURL(GURL(search_url), false, &consumer,
@@ skipping 24 matching lines @@
 #if defined(OS_MACOSX)
 #define MAYBE_NewWindowDismissesInstant DISABLED_NewWindowDismissesInstant
 #else
 #define MAYBE_NewWindowDismissesInstant NewWindowDismissesInstant
 #endif
 // Test that creating a new window hides any currently showing Instant overlay.
 IN_PROC_BROWSER_TEST_F(InstantTest, MAYBE_NewWindowDismissesInstant) {
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
   EXPECT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser()));
   FocusOmniboxAndWaitForInstantSupport();
-  SetOmniboxTextAndWaitForOverlayToShow("search");
+  ASSERT_TRUE(SetOmniboxTextAndWaitForOverlayToShow("search"));
 
   Browser* previous_window = browser();
   EXPECT_TRUE(instant()->IsOverlayingSearchResults());
   EXPECT_TRUE(instant()->model()->mode().is_search_suggestions());
 
   InstantTestModelObserver observer(instant()->model(),
                                     SearchMode::MODE_DEFAULT);
   chrome::NewEmptyWindow(browser()->profile(),
                          chrome::HOST_DESKTOP_TYPE_NATIVE);
-  observer.WaitForDesiredOverlayState();
+  ASSERT_TRUE(observer.WaitForExpectedOverlayState());
 
   // Even though we just created a new Browser object (for the new window), the
   // browser() accessor should still give us the first window's Browser object.
   EXPECT_EQ(previous_window, browser());
   EXPECT_FALSE(instant()->IsOverlayingSearchResults());
   EXPECT_TRUE(instant()->model()->mode().is_default());
 }
 
 // Test that the Instant overlay is recreated when all these conditions are met:
 // - The stale overlay timer has fired.
 // - The overlay is not showing.
 // - The omnibox doesn't have focus.
 IN_PROC_BROWSER_TEST_F(InstantTest, InstantOverlayRefresh) {
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
   FocusOmniboxAndWaitForInstantSupport();
 
   // The overlay is refreshed only after all three conditions above are met.
-  SetOmniboxTextAndWaitForOverlayToShow("query");
+  ASSERT_TRUE(SetOmniboxTextAndWaitForOverlayToShow("query"));
   instant()->overlay_->is_stale_ = true;
   instant()->ReloadOverlayIfStale();
   EXPECT_TRUE(instant()->overlay_->supports_instant());
   instant()->HideOverlay();
   EXPECT_TRUE(instant()->overlay_->supports_instant());
   instant()->OmniboxFocusChanged(OMNIBOX_FOCUS_NONE,
                                  OMNIBOX_FOCUS_CHANGE_EXPLICIT, NULL);
   EXPECT_FALSE(instant()->overlay_->supports_instant());
 
   // Try with a different ordering.
-  SetOmniboxTextAndWaitForOverlayToShow("query");
+  ASSERT_TRUE(SetOmniboxTextAndWaitForOverlayToShow("query"));
   instant()->overlay_->is_stale_ = true;
   instant()->ReloadOverlayIfStale();
   EXPECT_TRUE(instant()->overlay_->supports_instant());
   instant()->OmniboxFocusChanged(OMNIBOX_FOCUS_NONE,
                                  OMNIBOX_FOCUS_CHANGE_EXPLICIT, NULL);
   // TODO(sreeram): Currently, OmniboxLostFocus() calls HideOverlay(). When it
   // stops hiding the overlay eventually, uncomment these two lines:
   //     EXPECT_TRUE(instant()->overlay_->supports_instant());
   //     instant()->HideOverlay();
   EXPECT_FALSE(instant()->overlay_->supports_instant());
 }
 
 // Test that suggestions are case insensitive. http://crbug.com/150728
 IN_PROC_BROWSER_TEST_F(InstantTest, SuggestionsAreCaseInsensitive) {
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
   FocusOmniboxAndWaitForInstantSupport();
 
   EXPECT_TRUE(ExecuteScript("suggestion = [ { value: 'INSTANT' } ]"));
 
-  SetOmniboxTextAndWaitForOverlayToShow("in");
+  ASSERT_TRUE(SetOmniboxTextAndWaitForOverlayToShow("in"));
   EXPECT_EQ(ASCIIToUTF16("instant"), omnibox()->GetText());
 
   omnibox()->RevertAll();
-  SetOmniboxTextAndWaitForOverlayToShow("IN");
+  ASSERT_TRUE(SetOmniboxTextAndWaitForOverlayToShow("IN"));
   EXPECT_EQ(ASCIIToUTF16("INSTANT"), omnibox()->GetText());
 
   // U+0130 == LATIN CAPITAL LETTER I WITH DOT ABOVE
   EXPECT_TRUE(ExecuteScript("suggestion = [ { value: '\\u0130NSTANT' } ]"));
 
   omnibox()->RevertAll();
-  SetOmniboxTextAndWaitForOverlayToShow("i");
+  ASSERT_TRUE(SetOmniboxTextAndWaitForOverlayToShow("i"));
   EXPECT_EQ(WideToUTF16(L"i\u0307nstant"), omnibox()->GetText());
 
   omnibox()->RevertAll();
-  SetOmniboxTextAndWaitForOverlayToShow("I");
+  ASSERT_TRUE(SetOmniboxTextAndWaitForOverlayToShow("I"));
   EXPECT_EQ(WideToUTF16(L"I\u0307nstant"), omnibox()->GetText());
 
   omnibox()->RevertAll();
-  SetOmniboxTextAndWaitForOverlayToShow(WideToUTF8(L"i\u0307"));
+  ASSERT_TRUE(SetOmniboxTextAndWaitForOverlayToShow(WideToUTF8(L"i\u0307")));
   EXPECT_EQ(WideToUTF16(L"i\u0307nstant"), omnibox()->GetText());
 
   omnibox()->RevertAll();
-  SetOmniboxTextAndWaitForOverlayToShow(WideToUTF8(L"I\u0307"));
+  ASSERT_TRUE(SetOmniboxTextAndWaitForOverlayToShow(WideToUTF8(L"I\u0307")));
   EXPECT_EQ(WideToUTF16(L"I\u0307nstant"), omnibox()->GetText());
 
   omnibox()->RevertAll();
-  SetOmniboxTextAndWaitForOverlayToShow(WideToUTF8(L"\u0130"));
+  ASSERT_TRUE(SetOmniboxTextAndWaitForOverlayToShow(WideToUTF8(L"\u0130")));
   EXPECT_EQ(WideToUTF16(L"\u0130NSTANT"), omnibox()->GetText());
 
   omnibox()->RevertAll();
-  SetOmniboxTextAndWaitForOverlayToShow("in");
+  ASSERT_TRUE(SetOmniboxTextAndWaitForOverlayToShow("in"));
   EXPECT_EQ(ASCIIToUTF16("in"), omnibox()->GetText());
 
   omnibox()->RevertAll();
-  SetOmniboxTextAndWaitForOverlayToShow("IN");
+  ASSERT_TRUE(SetOmniboxTextAndWaitForOverlayToShow("IN"));
   EXPECT_EQ(ASCIIToUTF16("IN"), omnibox()->GetText());
 
   // Check that a d with a dot above and below it is completed regardless of
   // how that is encoded.
   // U+1E0D = LATIN SMALL LETTER D WITH DOT BELOW
   // U+1E0B = LATIN SMALL LETTER D WITH DOT ABOVE
   EXPECT_TRUE(ExecuteScript("suggestion = [ { value: '\\u1e0d\\u0307oh' } ]"));
 
   omnibox()->RevertAll();
-  SetOmniboxTextAndWaitForOverlayToShow(WideToUTF8(L"\u1e0b\u0323"));
+  ASSERT_TRUE(SetOmniboxTextAndWaitForOverlayToShow(
+      WideToUTF8(L"\u1e0b\u0323")));
   EXPECT_EQ(WideToUTF16(L"\u1e0b\u0323oh"), omnibox()->GetText());
 }
 
 // Flakes on Windows and Mac: http://crbug.com/170677
 #if defined(OS_WIN) || defined(OS_MACOSX)
 #define MAYBE_CommitInNewTab DISABLED_CommitInNewTab
 #else
 #define MAYBE_CommitInNewTab CommitInNewTab
 #endif
 // Test that the overlay can be committed onto a new tab.
 IN_PROC_BROWSER_TEST_F(InstantTest, MAYBE_CommitInNewTab) {
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
   FocusOmniboxAndWaitForInstantSupport();
 
   // Use the Instant page as the active tab, so we can exploit its visibility
   // handler to check visibility transitions.
   ui_test_utils::NavigateToURL(browser(), instant_url());
   content::WebContents* active_tab =
       browser()->tab_strip_model()->GetActiveWebContents();
 
   int active_tab_onvisibilitycalls = -1;
   EXPECT_TRUE(GetIntFromJS(active_tab, "onvisibilitycalls",
                            &active_tab_onvisibilitycalls));
   EXPECT_EQ(0, active_tab_onvisibilitycalls);
 
-  SetOmniboxTextAndWaitForOverlayToShow("search");
+  ASSERT_TRUE(SetOmniboxTextAndWaitForOverlayToShow("search"));
 
   // Stash a reference to the overlay, so we can refer to it after commit.
   content::WebContents* overlay = instant()->GetOverlayContents();
   EXPECT_TRUE(overlay);
 
   // The state of the searchbox before the commit.
   EXPECT_TRUE(UpdateSearchState(overlay));
   EXPECT_EQ("search", value_);
   EXPECT_FALSE(verbatim_);
   EXPECT_EQ(0, onsubmitcalls_);
@@ skipping 50 matching lines @@
 }
 
 // Test that suggestions are reusable.
 IN_PROC_BROWSER_TEST_F(InstantTest, SuggestionsAreReusable) {
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
   FocusOmniboxAndWaitForInstantSupport();
 
   EXPECT_TRUE(ExecuteScript("suggestion = [ { value: 'instant' } ];"
                             "behavior = 'never';"));
 
-  SetOmniboxTextAndWaitForOverlayToShow("in");
+  ASSERT_TRUE(SetOmniboxTextAndWaitForOverlayToShow("in"));
   EXPECT_EQ(ASCIIToUTF16("stant"), GetGrayText());
 
   SetOmniboxText("ins");
   EXPECT_EQ(ASCIIToUTF16("tant"), GetGrayText());
 
   SetOmniboxText("in");
   EXPECT_EQ(ASCIIToUTF16("stant"), GetGrayText());
 
   SetOmniboxText("insane");
   EXPECT_EQ(ASCIIToUTF16(""), GetGrayText());
 }
 
 // Test that the Instant overlay is recreated if it gets destroyed.
 IN_PROC_BROWSER_TEST_F(InstantTest, InstantRenderViewGone) {
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
   FocusOmniboxAndWaitForInstantSupport();
 
   // Type partial query, get suggestion to show.
-  SetOmniboxTextAndWaitForOverlayToShow("q");
+  ASSERT_TRUE(SetOmniboxTextAndWaitForOverlayToShow("q"));
   EXPECT_EQ(ASCIIToUTF16("query suggestion"), omnibox()->GetText());
 
   // Kill the Instant renderer and wait for Instant support again.
   KillInstantRenderView();
   FocusOmniboxAndWaitForInstantSupport();
 
-  SetOmniboxTextAndWaitForOverlayToShow("qu");
+  ASSERT_TRUE(SetOmniboxTextAndWaitForOverlayToShow("qu"));
   EXPECT_EQ(ASCIIToUTF16("query suggestion"), omnibox()->GetText());
 }
 
 IN_PROC_BROWSER_TEST_F(InstantTest, ProcessIsolation) {
   // Prior to setup no render process is dedicated to Instant.
   InstantService* instant_service =
         InstantServiceFactory::GetForProfile(browser()->profile());
   ASSERT_NE(static_cast<InstantService*>(NULL), instant_service);
   EXPECT_EQ(0, instant_service->GetInstantProcessCount());
 
   // Setup Instant.
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
   FocusOmniboxAndWaitForInstantSupport();
 
   // Now there should be a registered Instant render process.
   EXPECT_LT(0, instant_service->GetInstantProcessCount());
 
   // And the Instant overlay should live inside it.
   content::WebContents* overlay = instant()->GetOverlayContents();
   EXPECT_TRUE(instant_service->IsInstantProcess(
       overlay->GetRenderProcessHost()->GetID()));
 
   // Search and commit the search by pressing Alt-Enter.
-  SetOmniboxTextAndWaitForOverlayToShow("tractor");
+  ASSERT_TRUE(SetOmniboxTextAndWaitForOverlayToShow("tractor"));
   omnibox()->model()->AcceptInput(NEW_FOREGROUND_TAB, false);
 
   // The committed search results page should also live inside the
   // Instant process.
   content::WebContents* active_tab =
       browser()->tab_strip_model()->GetActiveWebContents();
   EXPECT_TRUE(instant_service->IsInstantProcess(
       active_tab->GetRenderProcessHost()->GetID()));
 
   // Navigating away should change the process.
   ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUINewTabURL));
   EXPECT_FALSE(instant_service->IsInstantProcess(
       active_tab->GetRenderProcessHost()->GetID()));
 }