Move instant support to SearchTabHelper.

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 347 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 start typing before InstantTab is properly hooked up.
-  // Should use the overlay.
+  // Open a new tab and navigate to instant URL. Start typing before InstantTab
+  // is properly hooked up. Should use the overlay.
   ui_test_utils::NavigateToURLWithDisposition(
       browser(),
-      GURL(chrome::kChromeUINewTabURL),
-      NEW_FOREGROUND_TAB,
-      ui_test_utils::BROWSER_TEST_WAIT_FOR_TAB);
+      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);
   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 2375 matching lines @@
   EXPECT_EQ(ASCIIToUTF16("flowers"), omnibox()->GetText());
 }
 
 #endif  // HTML_INSTANT_EXTENDED_POPUP
 
 #if !defined(HTML_INSTANT_EXTENDED_POPUP)
 IN_PROC_BROWSER_TEST_F(InstantExtendedTest, SearchReusesInstantTab) {
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
   FocusOmniboxAndWaitForInstantOverlayAndNTPSupport();
 
-  // Create an observer to wait for the instant tab to support Instant.
-  content::WindowedNotificationObserver observer(
+  // Open new tab. Preloaded NTP contents should have been used.
+  ui_test_utils::NavigateToURLWithDisposition(
+      browser(),
+      GURL(chrome::kChromeUINewTabURL),
+      NEW_FOREGROUND_TAB,
+      ui_test_utils::BROWSER_TEST_WAIT_FOR_TAB);
+
+  content::WindowedNotificationObserver observer_1(
       chrome::NOTIFICATION_INSTANT_TAB_SUPPORT_DETERMINED,
       content::NotificationService::AllSources());
-
   SetOmniboxText("flowers");
-  browser()->window()->GetLocationBar()->AcceptInput();
-  observer.Wait();
+  PressEnterAndWaitForNavigation();
+  observer_1.Wait();
 
   // Just did a regular search.
-  ASSERT_THAT(
-      browser()->tab_strip_model()->GetActiveWebContents()->GetURL().spec(),
-      HasSubstr("q=flowers"));
-  ASSERT_TRUE(UpdateSearchState(instant()->instant_tab()->contents()));
+  content::WebContents* active_tab =
+      browser()->tab_strip_model()->GetActiveWebContents();
+  ASSERT_THAT(active_tab->GetURL().spec(), HasSubstr("q=flowers"));
+  ASSERT_TRUE(UpdateSearchState(active_tab));
   ASSERT_EQ(0, submit_count_);
 
+  // Create an observer to wait for the instant tab to support Instant.
+  content::WindowedNotificationObserver observer_2(
+      chrome::NOTIFICATION_INSTANT_TAB_SUPPORT_DETERMINED,
+      content::NotificationService::AllSources());
   SetOmniboxText("puppies");
-  browser()->window()->GetLocationBar()->AcceptInput();
+  PressEnterAndWaitForNavigation();
+  observer_2.Wait();
 
   // Should have reused the tab and sent an onsubmit message.
-  ASSERT_THAT(
-      browser()->tab_strip_model()->GetActiveWebContents()->GetURL().spec(),
-      HasSubstr("q=flowers"));
-  ASSERT_TRUE(UpdateSearchState(instant()->instant_tab()->contents()));
+  active_tab = browser()->tab_strip_model()->GetActiveWebContents();
+  ASSERT_THAT(active_tab->GetURL().spec(), HasSubstr("q=puppies"));
+  ASSERT_TRUE(UpdateSearchState(active_tab));
   EXPECT_EQ(1, submit_count_);
 }
 
 IN_PROC_BROWSER_TEST_F(InstantExtendedTest,
                        SearchDoesntReuseInstantTabWithoutSupport) {
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
   FocusOmniboxAndWaitForInstantOverlayAndNTPSupport();
 
   // Don't wait for the navigation to complete.
   SetOmniboxText("flowers");
   browser()->window()->GetLocationBar()->AcceptInput();
 
   SetOmniboxText("puppies");
   browser()->window()->GetLocationBar()->AcceptInput();
 
   // Should not have reused the tab.
   ASSERT_THAT(
       browser()->tab_strip_model()->GetActiveWebContents()->GetURL().spec(),
       HasSubstr("q=puppies"));
 }
 
 IN_PROC_BROWSER_TEST_F(InstantExtendedTest,
                        TypedSearchURLDoesntReuseInstantTab) {
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
   FocusOmniboxAndWaitForInstantOverlayAndNTPSupport();
 
+  // Open new tab. Preloaded NTP contents should have been used.
+  ui_test_utils::NavigateToURLWithDisposition(
+      browser(),
+      GURL(chrome::kChromeUINewTabURL),
+      NEW_FOREGROUND_TAB,
+      ui_test_utils::BROWSER_TEST_WAIT_FOR_TAB);
+
   // Create an observer to wait for the instant tab to support Instant.
-  content::WindowedNotificationObserver observer(
+  content::WindowedNotificationObserver observer_1(
       chrome::NOTIFICATION_INSTANT_TAB_SUPPORT_DETERMINED,
       content::NotificationService::AllSources());
-
   SetOmniboxText("flowers");
-  browser()->window()->GetLocationBar()->AcceptInput();
-  observer.Wait();
+  PressEnterAndWaitForNavigation();
+  observer_1.Wait();
 
   // Just did a regular search.
-  ASSERT_THAT(
-      browser()->tab_strip_model()->GetActiveWebContents()->GetURL().spec(),
-      HasSubstr("q=flowers"));
-  ASSERT_TRUE(UpdateSearchState(instant()->instant_tab()->contents()));
+  content::WebContents* active_tab =
+      browser()->tab_strip_model()->GetActiveWebContents();
+  ASSERT_THAT(active_tab->GetURL().spec(), HasSubstr("q=flowers"));
+  ASSERT_TRUE(UpdateSearchState(active_tab));
   ASSERT_EQ(0, submit_count_);
 
   // Typed in a search URL "by hand".
+  content::WindowedNotificationObserver observer_2(
+      chrome::NOTIFICATION_INSTANT_TAB_SUPPORT_DETERMINED,
+      content::NotificationService::AllSources());
   SetOmniboxText(instant_url().spec() + "#q=puppies");
-  browser()->window()->GetLocationBar()->AcceptInput();
+  PressEnterAndWaitForNavigation();
+  observer_2.Wait();
 
   // Should not have reused the tab.
-  ASSERT_THAT(
-      browser()->tab_strip_model()->GetActiveWebContents()->GetURL().spec(),
-      HasSubstr("q=puppies"));
+  active_tab = browser()->tab_strip_model()->GetActiveWebContents();
+  ASSERT_THAT(active_tab->GetURL().spec(), HasSubstr("q=puppies"));
 }
 
 IN_PROC_BROWSER_TEST_F(InstantExtendedTest, OmniboxMarginSetForSearchURLs) {
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
   FocusOmniboxAndWaitForInstantOverlayAndNTPSupport();
 
   // Create an observer to wait for the instant tab to support Instant.
   content::WindowedNotificationObserver observer(
       chrome::NOTIFICATION_INSTANT_TAB_SUPPORT_DETERMINED,
       content::NotificationService::AllSources());
@@ skipping 36 matching lines @@
   browser()->tab_strip_model()->ActivateTabAt(0, false);
 
   // Switch back to new tab.
   browser()->tab_strip_model()->ActivateTabAt(1, false);
 
   // Confirm that new tab got no onmostvisitedchanged event.
   active_tab = browser()->tab_strip_model()->GetActiveWebContents();
   EXPECT_TRUE(UpdateSearchState(active_tab));
   EXPECT_EQ(2, on_most_visited_change_calls_);
 }