Revert 204709 "Move instant support to SearchTabHelper."

trunk/src/chrome/browser/ui/search/instant_test_utils.cc

Index: trunk/src/chrome/browser/ui/search/instant_test_utils.cc
===================================================================
--- trunk/src/chrome/browser/ui/search/instant_test_utils.cc	(revision 204944)
+++ trunk/src/chrome/browser/ui/search/instant_test_utils.cc	(working copy)
@@ -122,8 +122,10 @@
       chrome::NOTIFICATION_INSTANT_OVERLAY_SUPPORT_DETERMINED,
       content::NotificationService::AllSources());
   FocusOmnibox();
-  if (!instant()->overlay() || !instant()->overlay()->supports_instant())
+  if (!instant()->overlay() ||
+      !instant()->overlay()->instant_support_determined()) {
     observer.Wait();
+  }
 }
 
 void InstantTestBase::FocusOmniboxAndWaitForInstantOverlayAndNTPSupport() {
@@ -134,10 +136,14 @@
       chrome::NOTIFICATION_INSTANT_OVERLAY_SUPPORT_DETERMINED,
       content::NotificationService::AllSources());
   FocusOmnibox();
-  if (!instant()->ntp() || !instant()->ntp()->supports_instant())
+  if (!instant()->ntp() ||
+      !instant()->ntp()->instant_support_determined()) {
     ntp_observer.Wait();
-  if (!instant()->overlay() || !instant()->overlay()->supports_instant())
+  }
+  if (!instant()->overlay() ||
+      !instant()->overlay()->instant_support_determined()) {
     overlay_observer.Wait();
+  }
 }
 
 void InstantTestBase::SetOmniboxText(const std::string& text) {