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

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

 // 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.
 
 #ifndef CHROME_BROWSER_UI_SEARCH_INSTANT_TEST_UTILS_H_
 #define CHROME_BROWSER_UI_SEARCH_INSTANT_TEST_UTILS_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 70 matching lines @@
     return browser_->window()->GetLocationBar()->GetLocationEntry();
   }
 
   const GURL& instant_url() const { return instant_url_; }
 
   net::SpawnedTestServer& https_test_server() { return https_test_server_; }
 
   void KillInstantRenderView();
 
   void FocusOmnibox();
-  void FocusOmniboxAndWaitForInstantNTPSupport();
+  void FocusOmniboxAndWaitForInstantOverlaySupport();
+  void FocusOmniboxAndWaitForInstantOverlayAndNTPSupport();
 
   void SetOmniboxText(const std::string& text);
   bool SetOmniboxTextAndWaitForOverlayToShow(const std::string& text);
   void SetOmniboxTextAndWaitForSuggestion(const std::string& text);
 
   void PressEnterAndWaitForNavigation();
 
   bool GetBoolFromJS(content::WebContents* contents,
                      const std::string& script,
                      bool* result) WARN_UNUSED_RESULT;
@@ skipping 27 matching lines @@
 
   Browser* browser_;
 
   // HTTPS Testing server, started on demand.
   net::SpawnedTestServer https_test_server_;
 
   DISALLOW_COPY_AND_ASSIGN(InstantTestBase);
 };
 
 #endif  // CHROME_BROWSER_UI_SEARCH_INSTANT_TEST_UTILS_H_