InstantExtended: don't reset InstantTab if not ready.

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/prefs/pref_service.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
@@ skipping 297 matching lines @@
   EXPECT_TRUE(overlay);
   EXPECT_FALSE(instant()->IsOverlayingSearchResults());
   EXPECT_TRUE(instant()->model()->mode().is_default());
 
   // Typing in the omnibox should show the overlay.
   ASSERT_TRUE(SetOmniboxTextAndWaitForOverlayToShow("query"));
   EXPECT_TRUE(instant()->model()->mode().is_search_suggestions());
   EXPECT_EQ(overlay, instant()->GetOverlayContents());
 }
 
+IN_PROC_BROWSER_TEST_F(InstantExtendedTest, 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.
+  ui_test_utils::NavigateToURLWithDisposition(browser(),
+                                              GURL(chrome::kChromeUINewTabURL),
+                                              NEW_FOREGROUND_TAB,
+                                              ui_test_utils::BROWSER_TEST_NONE);
+  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,
+        content::NotificationService::AllSources());
+    instant_tab_observer.Wait();
+  }
+
+  // Hide the overlay. Now, we should be using Instant tab for suggestions.
+  instant()->HideOverlay();
+  EXPECT_TRUE(instant()->UseTabForSuggestions());
+}
+
 // Test that middle clicking on a suggestion opens the result in a new tab.
 IN_PROC_BROWSER_TEST_F(InstantExtendedTest,
                        MiddleClickOnSuggestionOpensInNewTab) {
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
   FocusOmniboxAndWaitForInstantOverlayAndNTPSupport();
   EXPECT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser()));
 
   EXPECT_EQ(1, browser()->tab_strip_model()->count());
 
   // Typing in the omnibox should show the overlay.
@@ skipping 1950 matching lines @@
   ASSERT_TRUE(AddSearchToHistory(ASCIIToUTF16("query"), 10000));
   BlockUntilHistoryProcessesPendingRequests();
 
   SetOmniboxText("quer");
 
   // Should get 2 suggestions from SearchProvider:
   //   - SWYT for "quer"
   //   - Search history suggestion for "query"
   EXPECT_EQ(2, CountSearchProviderSuggestions());
 }