Revert 204709 "Move instant support to SearchTabHelper."

trunk/src/chrome/browser/ui/search/instant_extended_interactive_uitest.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 <sstream>
 
 #include "base/command_line.h"
 #include "base/metrics/field_trial.h"
 #include "base/metrics/histogram_base.h"
 #include "base/metrics/histogram_samples.h"
@@ skipping 348 matching lines @@
 #if defined(OS_LINUX)
 #define MAYBE_UsesOverlayIfTabNotReady DISABLED_UsesOverlayIfTabNotReady
 #else
 #define MAYBE_UsesOverlayIfTabNotReady UsesOverlayIfTabNotReady
 #endif
 
 IN_PROC_BROWSER_TEST_F(InstantExtendedTest, MAYBE_UsesOverlayIfTabNotReady) {
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
   FocusOmniboxAndWaitForInstantOverlayAndNTPSupport();
 
-  // Open a new tab and navigate to instant URL. Start typing before InstantTab
-  // is properly hooked up. Should use the overlay.
+  // Open a new tab and start typing before InstantTab is properly hooked up.
+  // Should use the overlay.
   ui_test_utils::NavigateToURLWithDisposition(
       browser(),
-      instant_url(),
-      NEW_BACKGROUND_TAB,
-      ui_test_utils::BROWSER_TEST_NONE);
-  EXPECT_EQ(2, browser()->tab_strip_model()->count());
-  browser()->tab_strip_model()->ActivateTabAt(1, false);
+      GURL(chrome::kChromeUINewTabURL),
+      NEW_FOREGROUND_TAB,
+      ui_test_utils::BROWSER_TEST_WAIT_FOR_TAB);
   ASSERT_TRUE(SetOmniboxTextAndWaitForOverlayToShow("query"));
 
   // But Instant tab should still exist.
   ASSERT_NE(static_cast<InstantTab*>(NULL), instant()->instant_tab());
   EXPECT_FALSE(instant()->UseTabForSuggestions());
 
   // Wait for Instant Tab support if it still hasn't finished loading.
   if (!instant()->instant_tab()->supports_instant()) {
     content::WindowedNotificationObserver instant_tab_observer(
         chrome::NOTIFICATION_INSTANT_TAB_SUPPORT_DETERMINED,
@@ skipping 2324 matching lines @@
       GURL(chrome::kChromeUINewTabURL),
       NEW_FOREGROUND_TAB,
       ui_test_utils::BROWSER_TEST_WAIT_FOR_TAB);
   ASSERT_TRUE(ui_test_utils::SendKeyPressSync(browser(), ui::VKEY_OEM_PERIOD,
                                               true, true, false, false));
   EXPECT_TRUE(UpdateSearchState(instant()->instant_tab()->contents()));
   EXPECT_EQ(1, on_toggle_voice_search_calls_);
 }
 
 #endif  // HTML_INSTANT_EXTENDED_POPUP