Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(585)

Unified Diff: chrome/browser/ui/search/instant_test_utils.cc

Issue 14911005: Move instant support to SearchTabHelper. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix android_dbg test failures Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/search/instant_tab.cc ('k') | chrome/browser/ui/search/search_model.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/search/instant_test_utils.cc
diff --git a/chrome/browser/ui/search/instant_test_utils.cc b/chrome/browser/ui/search/instant_test_utils.cc
index 0a58371964005e27eedaad837e6f8ab352814216..b6e1d8886b9fad7e98b826587a9f9be93934e93e 100644
--- a/chrome/browser/ui/search/instant_test_utils.cc
+++ b/chrome/browser/ui/search/instant_test_utils.cc
@@ -122,10 +122,8 @@ void InstantTestBase::FocusOmniboxAndWaitForInstantOverlaySupport() {
chrome::NOTIFICATION_INSTANT_OVERLAY_SUPPORT_DETERMINED,
content::NotificationService::AllSources());
FocusOmnibox();
- if (!instant()->overlay() ||
- !instant()->overlay()->instant_support_determined()) {
+ if (!instant()->overlay() || !instant()->overlay()->supports_instant())
observer.Wait();
- }
}
void InstantTestBase::FocusOmniboxAndWaitForInstantOverlayAndNTPSupport() {
@@ -136,14 +134,10 @@ void InstantTestBase::FocusOmniboxAndWaitForInstantOverlayAndNTPSupport() {
chrome::NOTIFICATION_INSTANT_OVERLAY_SUPPORT_DETERMINED,
content::NotificationService::AllSources());
FocusOmnibox();
- if (!instant()->ntp() ||
- !instant()->ntp()->instant_support_determined()) {
+ if (!instant()->ntp() || !instant()->ntp()->supports_instant())
ntp_observer.Wait();
- }
- if (!instant()->overlay() ||
- !instant()->overlay()->instant_support_determined()) {
+ if (!instant()->overlay() || !instant()->overlay()->supports_instant())
overlay_observer.Wait();
- }
}
void InstantTestBase::SetOmniboxText(const std::string& text) {
« no previous file with comments | « chrome/browser/ui/search/instant_tab.cc ('k') | chrome/browser/ui/search/search_model.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698