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

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

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/search/instant_test_utils.h"
 
 #include "base/command_line.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url_service.h"
@@ skipping 100 matching lines @@
 void InstantTestBase::FocusOmnibox() {
   // If the omnibox already has focus, just notify Instant.
   if (omnibox()->model()->has_focus()) {
     instant()->OmniboxFocusChanged(OMNIBOX_FOCUS_VISIBLE,
                                    OMNIBOX_FOCUS_CHANGE_EXPLICIT, NULL);
   } else {
     browser_->window()->GetLocationBar()->FocusLocation(false);
   }
 }
 
-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) {
   FocusOmnibox();
   omnibox()->SetUserText(UTF8ToUTF16(text));
 }
 
 bool InstantTestBase::SetOmniboxTextAndWaitForOverlayToShow(
     const std::string& text) {
   // The order of events may be:
@@ skipping 89 matching lines @@
   size_t start = 0, end = 0;
   omnibox()->GetSelectionBounds(&start, &end);
   if (start > end)
     std::swap(start, end);
   return omnibox()->GetText().substr(start, end - start);
 }
 
 string16 InstantTestBase::GetGrayText() {
   return omnibox()->GetInstantSuggestion();
 }