InstantExtendedManualTests should fail and not hang

chrome/browser/ui/search/instant_test_utils.h

Index: chrome/browser/ui/search/instant_test_utils.h
diff --git a/chrome/browser/ui/search/instant_test_utils.h b/chrome/browser/ui/search/instant_test_utils.h
index 902af6e9cd044c68c08854f37a2b13f5d6ff18db..1eb6a564784b72551f2639880eeed8f43c5308a7 100644
--- a/chrome/browser/ui/search/instant_test_utils.h
+++ b/chrome/browser/ui/search/instant_test_utils.h
@@ -32,17 +32,20 @@ class WebContents;
 class InstantTestModelObserver : public InstantOverlayModelObserver {
  public:
   InstantTestModelObserver(InstantOverlayModel* model,
-                           SearchMode::Type desired_mode_type);
+                           SearchMode::Type expected_mode_type);
   ~InstantTestModelObserver();

[James Cook, 2013/04/16 22:57:14]

drive-by comment: needs "virtual"

[dhollowa, 2013/04/16 23:01:43]

Done.

 
-  void WaitForDesiredOverlayState();
+  // Returns true if the |expected_mode_type_| was observed in
+  // OverlayStateChanged.
+  bool WaitForExpectedOverlayState();
 
   // Overridden from InstantOverlayModelObserver:
   virtual void OverlayStateChanged(const InstantOverlayModel& model) OVERRIDE;
 
  private:
   InstantOverlayModel* const model_;
-  const SearchMode::Type desired_mode_type_;
+  const SearchMode::Type expected_mode_type_;
+  SearchMode::Type observed_mode_type_;
   base::RunLoop run_loop_;
 
   DISALLOW_COPY_AND_ASSIGN(InstantTestModelObserver);
@@ -89,7 +92,7 @@ class InstantTestBase {
   void FocusOmniboxAndWaitForInstantExtendedSupport();
 
   void SetOmniboxText(const std::string& text);
-  void SetOmniboxTextAndWaitForOverlayToShow(const std::string& text);
+  bool SetOmniboxTextAndWaitForOverlayToShow(const std::string& text);
   void SetOmniboxTextAndWaitForSuggestion(const std::string& text);
 
   bool GetBoolFromJS(content::WebContents* contents,