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

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

Issue 16035020: Move instant support to SearchTabHelper. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed nits 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 29b460ad4ca7079454b3f471743b50244257c46c..1ee4f887a1c5808a79e8a7bd273ba0e150c5f3fe 100644
--- a/chrome/browser/ui/search/instant_test_utils.cc
+++ b/chrome/browser/ui/search/instant_test_utils.cc
@@ -123,10 +123,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() {
@@ -137,14 +135,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