InstantExtendedManualTests should fail and not hang

chrome/browser/ui/search/instant_test_utils.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 "chrome/browser/ui/search/instant_test_utils.h"
 
 #include "base/command_line.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url_service.h"
@@ skipping 15 matching lines @@
 std::string WrapScript(const std::string& script) {
   return "domAutomationController.send(" + script + ")";
 }
 
 }  // namespace
 
 // InstantTestModelObserver --------------------------------------------------
 
 InstantTestModelObserver::InstantTestModelObserver(
     InstantOverlayModel* model,
-    SearchMode::Type desired_mode_type)
+    SearchMode::Type expected_mode_type)
     : model_(model),
-      desired_mode_type_(desired_mode_type) {
+      expected_mode_type_(expected_mode_type),
+      observed_mode_type_(static_cast<SearchMode::Type>(-1)) {
   model_->AddObserver(this);
 }
 
 InstantTestModelObserver::~InstantTestModelObserver() {
   model_->RemoveObserver(this);
 }
 
-void InstantTestModelObserver::WaitForDesiredOverlayState() {
+bool InstantTestModelObserver::WaitForExpectedOverlayState() {
   run_loop_.Run();
+  return observed_mode_type_ == expected_mode_type_;
 }
 
 void InstantTestModelObserver::OverlayStateChanged(
     const InstantOverlayModel& model) {
-  if (model.mode().mode == desired_mode_type_)
-    run_loop_.Quit();
+  observed_mode_type_ = model.mode().mode;

[Jered, 2013/04/16 22:35:57]

I'm worried that this might break some tests which previously skipped over
intermediate updates to an undesired state. Please try it out. But I think
that's fishy enough that we should disable such tests.

[dhollowa, 2013/04/16 22:50:51]

Yes, I verified.  No problems with this.

+  EXPECT_EQ(expected_mode_type_, observed_mode_type_);
+  run_loop_.Quit();
 }
 
 // InstantTestBase -----------------------------------------------------------
 
 void InstantTestBase::SetupInstant(Browser* browser) {
   browser_ = browser;
   TemplateURLService* service =
       TemplateURLServiceFactory::GetForProfile(browser_->profile());
   ui_test_utils::WaitForTemplateURLServiceToLoad(service);
 
@@ skipping 69 matching lines @@
   FocusOmnibox();
   ntp_observer.Wait();
   overlay_observer.Wait();
 }
 
 void InstantTestBase::SetOmniboxText(const std::string& text) {
   FocusOmnibox();
   omnibox()->SetUserText(UTF8ToUTF16(text));
 }
 
-void InstantTestBase::SetOmniboxTextAndWaitForOverlayToShow(
+bool InstantTestBase::SetOmniboxTextAndWaitForOverlayToShow(
     const std::string& text) {
   InstantTestModelObserver observer(
       instant()->model(), SearchMode::MODE_SEARCH_SUGGESTIONS);
   SetOmniboxText(text);
-  observer.WaitForDesiredOverlayState();
+  return observer.WaitForExpectedOverlayState();
 }
 
 void InstantTestBase::SetOmniboxTextAndWaitForSuggestion(
     const std::string& text) {
   content::WindowedNotificationObserver observer(
       chrome::NOTIFICATION_INSTANT_SET_SUGGESTION,
       content::NotificationService::AllSources());
   SetOmniboxText(text);
   observer.Wait();
 }
@@ skipping 55 matching lines @@
   size_t start = 0, end = 0;
   omnibox()->GetSelectionBounds(&start, &end);
   if (start > end)
     std::swap(start, end);
   return omnibox()->GetText().substr(start, end - start);
 }
 
 string16 InstantTestBase::GetGrayText() {
   return omnibox()->GetInstantSuggestion();
 }