Revert 207790 "InstantExtended: Don't create overlay, again."

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 207797)
+++ trunk/src/chrome/browser/ui/search/instant_test_utils.cc	(working copy)
@@ -118,13 +118,27 @@
   }
 }
 
-void InstantTestBase::FocusOmniboxAndWaitForInstantNTPSupport() {
+void InstantTestBase::FocusOmniboxAndWaitForInstantOverlaySupport() {
+  content::WindowedNotificationObserver observer(
+      chrome::NOTIFICATION_INSTANT_OVERLAY_SUPPORT_DETERMINED,
+      content::NotificationService::AllSources());
+  FocusOmnibox();
+  if (!instant()->overlay() || !instant()->overlay()->supports_instant())
+    observer.Wait();
+}
+
+void InstantTestBase::FocusOmniboxAndWaitForInstantOverlayAndNTPSupport() {
   content::WindowedNotificationObserver ntp_observer(
       chrome::NOTIFICATION_INSTANT_NTP_SUPPORT_DETERMINED,
       content::NotificationService::AllSources());
+  content::WindowedNotificationObserver overlay_observer(
+      chrome::NOTIFICATION_INSTANT_OVERLAY_SUPPORT_DETERMINED,
+      content::NotificationService::AllSources());
   FocusOmnibox();
   if (!instant()->ntp() || !instant()->ntp()->supports_instant())
     ntp_observer.Wait();
+  if (!instant()->overlay() || !instant()->overlay()->supports_instant())
+    overlay_observer.Wait();
 }
 
 void InstantTestBase::SetOmniboxText(const std::string& text) {