summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui/search/instant_test_utils.h
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/ui/search/instant_test_utils.h')
-rw-r--r--chrome/browser/ui/search/instant_test_utils.h25
1 files changed, 0 insertions, 25 deletions
diff --git a/chrome/browser/ui/search/instant_test_utils.h b/chrome/browser/ui/search/instant_test_utils.h
index 9ab18b8..5072443 100644
--- a/chrome/browser/ui/search/instant_test_utils.h
+++ b/chrome/browser/ui/search/instant_test_utils.h
@@ -16,7 +16,6 @@
#include "chrome/browser/ui/browser_window.h"
#include "chrome/browser/ui/omnibox/location_bar.h"
#include "chrome/browser/ui/search/instant_controller.h"
-#include "chrome/browser/ui/search/instant_overlay_model_observer.h"
#include "chrome/common/search_types.h"
#include "googleurl/src/gurl.h"
#include "net/test/spawned_test_server/spawned_test_server.h"
@@ -30,28 +29,6 @@ namespace content {
class WebContents;
};
-class InstantTestModelObserver : public InstantOverlayModelObserver {
- public:
- InstantTestModelObserver(InstantOverlayModel* model,
- SearchMode::Type expected_mode_type);
- virtual ~InstantTestModelObserver();
-
- // Returns the observed mode type, may be different than the
- // |expected_mode_type_| that was observed in OverlayStateChanged.
- SearchMode::Type WaitForExpectedOverlayState();
-
- // Overridden from InstantOverlayModelObserver:
- virtual void OverlayStateChanged(const InstantOverlayModel& model) OVERRIDE;
-
- private:
- InstantOverlayModel* const model_;
- 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 {
@@ -96,8 +73,6 @@ class InstantTestBase {
void FocusOmniboxAndWaitForInstantNTPSupport();
void SetOmniboxText(const std::string& text);
- bool SetOmniboxTextAndWaitForOverlayToShow(const std::string& text);
- void SetOmniboxTextAndWaitForSuggestion(const std::string& text);
void PressEnterAndWaitForNavigation();