InstantExtendedManualTests should fail and not hang

chrome/browser/ui/search/instant_extended_manual_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 "base/string_util.h"
 #include "chrome/browser/search/search.h"
 #include "chrome/browser/task_manager/task_manager.h"
 #include "chrome/browser/task_manager/task_manager_browsertest_util.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
@@ skipping 66 matching lines @@
         chrome::NOTIFICATION_INSTANT_SET_SUGGESTION,
         content::NotificationService::AllSources());
     bool result = PressBackspace();
     observer.Wait();
     return result;
   }
 
   bool PressBackspaceAndWaitForOverlayToShow() {
     InstantTestModelObserver observer(
         instant()->model(), SearchMode::MODE_SEARCH_SUGGESTIONS);
-    bool result = PressBackspace();
-    observer.WaitForDesiredOverlayState();
-    return result;
+    return PressBackspace() && observer.WaitForExpectedOverlayState();
   }
 
   void PressEnterAndWaitForNavigation() {
     content::WindowedNotificationObserver nav_observer(
         content::NOTIFICATION_NAV_ENTRY_COMMITTED,
         content::NotificationService::AllSources());
     browser()->window()->GetLocationBar()->AcceptInput();
     nav_observer.Wait();
   }
 
@@ skipping 59 matching lines @@
 
 // TODO: http://crbug.com/230940
 IN_PROC_BROWSER_TEST_F(InstantExtendedManualTest,
                        DISABLED_BackspaceFromQueryToSameQueryAndSearch) {
   set_browser(browser());
   FocusOmniboxAndWaitForInstantExtendedSupport();
   EXPECT_TRUE(OverlayIsGoogle());
 
   // Type "face" and expect Google to set gray text for "book" to suggest
   // [facebook], the query.
-  SetOmniboxTextAndWaitForOverlayToShow("face");
+  ASSERT_TRUE(SetOmniboxTextAndWaitForOverlayToShow("face"));
   EXPECT_EQ(ASCIIToUTF16("face"), omnibox()->GetText());
   EXPECT_EQ(ASCIIToUTF16("book"), GetGrayText());
 
   // Backspace to the text "fac".
   EXPECT_TRUE(PressBackspaceAndWaitForSuggestions());
   EXPECT_EQ(ASCIIToUTF16("fac"), omnibox()->GetText());
   EXPECT_EQ(ASCIIToUTF16("ebook"), GetGrayText());
 
   // Press Enter. The page should show search results for [fac].
   EXPECT_TRUE(PressEnterAndWaitForNavigationWithTitle(
       instant()->GetOverlayContents(),
       ASCIIToUTF16("fac - Google Search")));
 }
 
 // TODO: http://crbug.com/230940
 IN_PROC_BROWSER_TEST_F(InstantExtendedManualTest,
                        DISABLED_BackspaceFromQueryToOtherQueryAndSearch) {
   set_browser(browser());
   FocusOmniboxAndWaitForInstantExtendedSupport();
   EXPECT_TRUE(OverlayIsGoogle());
 
   // Type "fan" and expect Google to set gray text to "dango" to suggest
   // [fandango], the query.
-  SetOmniboxTextAndWaitForOverlayToShow("fan");
+  ASSERT_TRUE(SetOmniboxTextAndWaitForOverlayToShow("fan"));
   EXPECT_EQ(ASCIIToUTF16("fan"), omnibox()->GetText());
   EXPECT_EQ(ASCIIToUTF16("dango"), GetGrayText());
 
   // Backspace to the text "fa". Expect Google to set gray text for "cebook" to
   // suggest [facebook], the query.
   EXPECT_TRUE(PressBackspaceAndWaitForSuggestions());
   EXPECT_EQ(ASCIIToUTF16("fa"), omnibox()->GetText());
   EXPECT_EQ(ASCIIToUTF16("cebook"), GetGrayText());
 
   // Press Enter. Instant should clear gray text and submit the query [fa].
   EXPECT_TRUE(PressEnterAndWaitForNavigationWithTitle(
       instant()->GetOverlayContents(),
       ASCIIToUTF16("fa - Google Search")));
 }
 
 // TODO: http://crbug.com/230537
 IN_PROC_BROWSER_TEST_F(InstantExtendedManualTest,
                        DISABLED_BackspaceFromUrlToNonSelectedUrlAndSearch) {
   set_browser(browser());
   FocusOmniboxAndWaitForInstantExtendedSupport();
   EXPECT_TRUE(OverlayIsGoogle());
 
   // Type "facebook.c" and expect Google to set blue text to "om" to suggest
   // http://www.facebook.com/, the URL.
-  SetOmniboxTextAndWaitForOverlayToShow("facebook.c");
+  ASSERT_TRUE(SetOmniboxTextAndWaitForOverlayToShow("facebook.c"));
   EXPECT_EQ(ASCIIToUTF16("facebook.com"), omnibox()->GetText());
   EXPECT_EQ(ASCIIToUTF16("om"), GetBlueText());
   bool selected = false;
   EXPECT_TRUE(GetSelectionState(&selected));
   EXPECT_TRUE(selected);
 
   // Backspace to the text "facebook.c". Expect no suggestion text and no
   // selected suggestion.
   // Page won't actually show because it's showing "press enter to search".
   EXPECT_TRUE(PressBackspaceAndWaitForSuggestions());
   EXPECT_EQ(ASCIIToUTF16("facebook.c"), omnibox()->GetText());
   EXPECT_EQ(ASCIIToUTF16(""), GetBlueText());
   EXPECT_EQ(ASCIIToUTF16(""), GetGrayText());
   EXPECT_TRUE(GetSelectionState(&selected));
   EXPECT_FALSE(selected);
 
   // Press Enter. Instant should submit the query "facebook.c".
   EXPECT_TRUE(PressEnterAndWaitForNavigationWithTitle(
       active_tab(), ASCIIToUTF16("facebook.c - Google Search")));
 }
 
 IN_PROC_BROWSER_TEST_F(InstantExtendedManualTest,
                        MANUAL_BackspaceFromUrlToUrlAndNavigate) {
   set_browser(browser());
   FocusOmniboxAndWaitForInstantExtendedSupport();
   EXPECT_TRUE(OverlayIsGoogle());
 
   // Type "facebook.com/" and expect Google to set blue text to "login.php" to
   // suggest http://www.facebook.com/login.php, the URL.
-  SetOmniboxTextAndWaitForOverlayToShow("facebook.com/");
+  ASSERT_TRUE(SetOmniboxTextAndWaitForOverlayToShow("facebook.com/"));
   EXPECT_EQ(ASCIIToUTF16("facebook.com/login.php"), omnibox()->GetText());
   EXPECT_EQ(ASCIIToUTF16("login.php"), GetBlueText());
   bool selected = false;
   EXPECT_TRUE(GetSelectionState(&selected));
   EXPECT_TRUE(selected);
 
   // Backspace to the text "facebook.com/". There should be no suggestion text,
   // but the first suggestion should be selected.
   EXPECT_TRUE(PressBackspaceAndWaitForSuggestions());
   EXPECT_EQ(ASCIIToUTF16("facebook.com/"), omnibox()->GetText());
@@ skipping 10 matching lines @@
 
 // TODO: http://crbug.com/230537
 IN_PROC_BROWSER_TEST_F(InstantExtendedManualTest,
                        DISABLED_BackspaceFromQueryToSelectedUrlAndNavigate) {
   set_browser(browser());
   FocusOmniboxAndWaitForInstantExtendedSupport();
   EXPECT_TRUE(OverlayIsGoogle());
 
   // Type "a.cop" and expect Google to set gray text to "land" to suggest the
   // query [a.copland].
-  SetOmniboxTextAndWaitForOverlayToShow("a.cop");
+  ASSERT_TRUE(SetOmniboxTextAndWaitForOverlayToShow("a.cop"));
   EXPECT_EQ(ASCIIToUTF16("a.cop"), omnibox()->GetText());
   EXPECT_EQ(ASCIIToUTF16("land"), GetGrayText());
 
   // Backspace to the text "a.co". Expect no suggestion text, but the
   // first suggestion should be selected URL "a.co".
   EXPECT_TRUE(PressBackspaceAndWaitForSuggestions());
   EXPECT_EQ(ASCIIToUTF16("a.co"), omnibox()->GetText());
   EXPECT_EQ(ASCIIToUTF16(""), GetBlueText());
   EXPECT_EQ(ASCIIToUTF16(""), GetGrayText());
   bool selected = false;
   EXPECT_TRUE(GetSelectionState(&selected));
   EXPECT_TRUE(selected);
 
   // Press Enter. Instant should navigate to a.co/.
   PressEnterAndWaitForNavigation();
   EXPECT_TRUE(GetActiveTabURL().DomainIs("amazon.com"));
 }
 
 // TODO: http://crbug.com/230491
 IN_PROC_BROWSER_TEST_F(InstantExtendedManualTest,
                        DISABLED_BackspaceFromSelectedUrlToQueryAndSearch) {
   set_browser(browser());
   FocusOmniboxAndWaitForInstantExtendedSupport();
   EXPECT_TRUE(OverlayIsGoogle());
 
   // Type "e.co/" and expect the top suggestion to be the URL "e.co/".
-  SetOmniboxTextAndWaitForOverlayToShow("e.co/");
+  ASSERT_TRUE(SetOmniboxTextAndWaitForOverlayToShow("e.co/"));
   EXPECT_EQ(ASCIIToUTF16("e.co/"), omnibox()->GetText());
   EXPECT_EQ(ASCIIToUTF16(""), GetBlueText());
   EXPECT_EQ(ASCIIToUTF16(""), GetGrayText());
   bool selected = false;
   EXPECT_TRUE(GetSelectionState(&selected));
   EXPECT_TRUE(selected);
 
   // Backspace to the text "e.co". Expect Google to suggest the query [e.coli].
   EXPECT_TRUE(PressBackspaceAndWaitForOverlayToShow());
   EXPECT_EQ(ASCIIToUTF16("e.co"), omnibox()->GetText());
   EXPECT_EQ(ASCIIToUTF16(""), GetBlueText());
   EXPECT_EQ(ASCIIToUTF16("li"), GetGrayText());
   selected = true;
   EXPECT_TRUE(GetSelectionState(&selected));
   EXPECT_FALSE(selected);
 
   // Press Enter. Instant should search for "e.co".
   EXPECT_TRUE(PressEnterAndWaitForNavigationWithTitle(
       instant()->GetOverlayContents(),
       ASCIIToUTF16("e.co - Google Search")));
 }
 
 IN_PROC_BROWSER_TEST_F(InstantExtendedManualTest, MANUAL_TypeURLAndPressEnter) {
   set_browser(browser());
   FocusOmniboxAndWaitForInstantExtendedSupport();
   EXPECT_TRUE(OverlayIsGoogle());
 
   // Type "www.facebook.com" and expect the top suggestion to be the URL
   // facebook.com.
-  SetOmniboxTextAndWaitForOverlayToShow("www.facebook.com");
+  ASSERT_TRUE(SetOmniboxTextAndWaitForOverlayToShow("www.facebook.com"));
   EXPECT_EQ(ASCIIToUTF16("www.facebook.com"), omnibox()->GetText());
   EXPECT_EQ(ASCIIToUTF16(""), GetBlueText());
   bool selected = false;
   EXPECT_TRUE(GetSelectionState(&selected));
   EXPECT_TRUE(selected);
 
   // Press Enter. Should navigate to facebook.com.
   PressEnterAndWaitForNavigation();
   EXPECT_TRUE(GetActiveTabURL().DomainIs("facebook.com"));
 }
 
+// TODO: http://crbug.com/232088
 IN_PROC_BROWSER_TEST_F(InstantExtendedManualTest,
-                       MANUAL_TypeAutocompletedURLAndPressEnter) {
+                       DISABLED_TypeAutocompletedURLAndPressEnter) {
   set_browser(browser());
   FocusOmniboxAndWaitForInstantExtendedSupport();
   EXPECT_TRUE(OverlayIsGoogle());
 
   // Type "www.facebook." and expect the top suggestion to be the URL
   // www.facebook.com.
   SetOmniboxTextAndWaitForSuggestion("www.facebook.");
   EXPECT_EQ(ASCIIToUTF16("www.facebook.com"), omnibox()->GetText());
   EXPECT_EQ(ASCIIToUTF16("com"), GetBlueText());
   bool selected = false;
   EXPECT_TRUE(GetSelectionState(&selected));
   EXPECT_TRUE(selected);
 
   // Press Enter. Should navigate to facebook.com.
   PressEnterAndWaitForNavigation();
   EXPECT_TRUE(GetActiveTabURL().DomainIs("facebook.com"));
 }
 
+// TODO: http://crbug.com/230537
 IN_PROC_BROWSER_TEST_F(InstantExtendedManualTest,
-                       MANUAL_PasteURLAndPressEnter) {
+                       DISABLED_PasteURLAndPressEnter) {
   set_browser(browser());
   FocusOmniboxAndWaitForInstantExtendedSupport();
   EXPECT_TRUE(OverlayIsGoogle());
 
   // Paste "www.facebook.com" and expect the top suggestion to be the URL
   // facebook.com.
   InstantTestModelObserver observer(
       instant()->model(), SearchMode::MODE_SEARCH_SUGGESTIONS);
   omnibox()->OnBeforePossibleChange();
   omnibox()->model()->on_paste();
   SetOmniboxText("www.facebook.com");
   omnibox()->OnAfterPossibleChange();
-  observer.WaitForDesiredOverlayState();
+  ASSERT_TRUE(observer.WaitForExpectedOverlayState());
   EXPECT_EQ(ASCIIToUTF16("www.facebook.com"), omnibox()->GetText());
   EXPECT_EQ(string16(), GetBlueText());
   bool selected = false;
   EXPECT_TRUE(GetSelectionState(&selected));
   EXPECT_TRUE(selected);
 
   // Press Enter. Should navigate to facebook.com.
   PressEnterAndWaitForNavigation();
   EXPECT_TRUE(GetActiveTabURL().DomainIs("facebook.com"));
 }
@@ skipping 27 matching lines @@
   content::WindowedNotificationObserver nav_observer(
       content::NOTIFICATION_NAV_ENTRY_COMMITTED,
       content::NotificationService::AllSources());
   omnibox()->model()->OnControlKeyChanged(true);
   browser()->window()->GetLocationBar()->AcceptInput();
   nav_observer.Wait();
   // example.com redirects to iana.
   EXPECT_TRUE(GetActiveTabURL().DomainIs("example.com") ||
               GetActiveTabURL().DomainIs("iana.org"));
 }