InstantExtendedManualTests should fail and not hang

chrome/browser/ui/search/instant_test_utils.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_SEARCH_INSTANT_TEST_UTILS_H_
 #define CHROME_BROWSER_UI_SEARCH_INSTANT_TEST_UTILS_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 14 matching lines @@
 class InstantModel;
 class OmniboxView;
 
 namespace content {
 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);
 };
 
 // This utility class is meant to be used in a "mix-in" fashion, giving the
 // derived test class additional Instant-related functionality.
 class InstantTestBase {
  protected:
   InstantTestBase()
@@ skipping 26 matching lines @@
 
   net::TestServer& https_test_server() { return https_test_server_; }
 
   void KillInstantRenderView();
 
   void FocusOmnibox();
   void FocusOmniboxAndWaitForInstantSupport();
   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,
                      const std::string& script,
                      bool* result) WARN_UNUSED_RESULT;
   bool GetIntFromJS(content::WebContents* contents,
                     const std::string& script,
                     int* result) WARN_UNUSED_RESULT;
   bool GetStringFromJS(content::WebContents* contents,
                        const std::string& script,
@@ skipping 22 matching lines @@
 
   Browser* browser_;
 
   // HTTPS Testing server, started on demand.
   net::TestServer https_test_server_;
 
   DISALLOW_COPY_AND_ASSIGN(InstantTestBase);
 };
 
 #endif  // CHROME_BROWSER_UI_SEARCH_INSTANT_TEST_UTILS_H_