Fall back to local page if online NTP fails to load.

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 17 matching lines @@
 #include "chrome/browser/history/top_sites.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search/instant_service.h"
 #include "chrome/browser/search/instant_service_factory.h"
 #include "chrome/browser/search/search.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/themes/theme_service_factory.h"
+#include "chrome/browser/ui/browser_list.h"
+#include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/omnibox/omnibox_view.h"
 #include "chrome/browser/ui/search/instant_commit_type.h"
 #include "chrome/browser/ui/search/instant_ntp.h"
 #include "chrome/browser/ui/search/instant_overlay.h"
 #include "chrome/browser/ui/search/instant_tab.h"
 #include "chrome/browser/ui/search/instant_test_utils.h"
 #include "chrome/browser/ui/search/search_tab_helper.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/webui/theme_source.h"
 #include "chrome/common/chrome_notification_types.h"
@@ skipping 58 matching lines @@
  public:
   InstantExtendedTest()
       : on_most_visited_change_calls_(0),
         most_visited_items_count_(0),
         first_most_visited_item_id_(0),
         on_native_suggestions_calls_(0),
         on_change_calls_(0),
         submit_count_(0) {
   }
  protected:
-  virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
-    chrome::EnableInstantExtendedAPIForTesting();
+  virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
+    command_line->AppendSwitch(switches::kEnableInstantExtendedAPI);
     ASSERT_TRUE(https_test_server().Start());
     GURL instant_url = https_test_server().GetURL(
         "files/instant_extended.html?strk=1&");
     InstantTestBase::Init(instant_url);
   }
 
   virtual void SetUpOnMainThread() OVERRIDE {
     browser()->toolbar_model()->SetSupportsExtractionOfURLLikeSearchTerms(true);
   }
 
@@ skipping 87 matching lines @@
 };
 
 // Test class used to verify chrome-search: scheme and access policy from the
 // Instant overlay.  This is a subclass of |ExtensionBrowserTest| because it
 // loads a theme that provides a background image.
 class InstantPolicyTest : public ExtensionBrowserTest, public InstantTestBase {
  public:
   InstantPolicyTest() {}
 
  protected:
+  virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
+    command_line->AppendSwitch(switches::kEnableInstantExtendedAPI);
+  }
+
   virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
-    chrome::EnableInstantExtendedAPIForTesting();
     ASSERT_TRUE(https_test_server().Start());
     GURL instant_url = https_test_server().GetURL(
         "files/instant_extended.html?strk=1&");
     InstantTestBase::Init(instant_url);
   }
 
   void InstallThemeSource() {
     ThemeSource* theme = new ThemeSource(profile());
     content::URLDataSource::Add(profile(), theme);
   }
@@ skipping 559 matching lines @@
   EXPECT_EQ(instant()->GetLocalInstantURL(), active_tab->GetURL().spec());
 }
 
 IN_PROC_BROWSER_TEST_F(InstantExtendedTest, PreloadedNTPDoesntSupportInstant) {
   // Setup Instant.
   GURL instant_url = test_server()->GetURL("files/empty.html?strk=1");
   InstantTestBase::Init(instant_url);
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
   FocusOmniboxAndWaitForInstantOverlayAndNTPSupport();
 
-  // NTP contents should not be preloaded.
-  ASSERT_EQ(static_cast<InstantNTP*>(NULL), instant()->ntp());
+  // NTP contents should have fallen back to the local page.
+  ASSERT_NE(static_cast<InstantNTP*>(NULL), instant()->ntp());
+  EXPECT_TRUE(instant()->ntp()->IsLocal());
 
   // Open new tab. Should use local NTP.
   ui_test_utils::NavigateToURLWithDisposition(
       browser(),
       GURL(chrome::kChromeUINewTabURL),
       NEW_FOREGROUND_TAB,
       ui_test_utils::BROWSER_TEST_WAIT_FOR_TAB);
   content::WebContents* active_tab =
       browser()->tab_strip_model()->GetActiveWebContents();
   EXPECT_EQ(instant()->GetLocalInstantURL(), active_tab->GetURL().spec());
@@ skipping 1233 matching lines @@
   FocusOmnibox();
   EXPECT_FALSE(instant()->overlay()->IsLocal());
 }
 
 IN_PROC_BROWSER_TEST_F(InstantExtendedTest, OverlayDoesntSupportInstant) {
   GURL instant_url = test_server()->GetURL("files/empty.html?strk=1");
   InstantTestBase::Init(instant_url);
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
 
   // Focus the omnibox. When the support determination response comes back,
-  // Instant will destroy the non-Instant page.
+  // Instant will destroy the non-Instant page and fall back to the local page.
   FocusOmniboxAndWaitForInstantOverlayAndNTPSupport();
-  EXPECT_EQ(NULL, instant()->GetOverlayContents());
+  ASSERT_NE(static_cast<InstantOverlay*>(NULL), instant()->overlay());
+  EXPECT_TRUE(instant()->overlay()->IsLocal());
 
   // The local overlay is used on the next Update().
   SetOmniboxText("query");
   EXPECT_TRUE(instant()->overlay()->IsLocal());
 
   // Switched back to the remote overlay when omnibox loses and regains focus.
   instant()->HideOverlay();
   browser()->tab_strip_model()->GetActiveWebContents()->GetView()->Focus();
   FocusOmnibox();
   EXPECT_FALSE(instant()->overlay()->IsLocal());
 
-  // Overlay destroyed again after determining support.
+  // Overlay falls back to local again after determining support.
   FocusOmniboxAndWaitForInstantOverlaySupport();
-  EXPECT_EQ(NULL, instant()->GetOverlayContents());
+  ASSERT_NE(static_cast<InstantOverlay*>(NULL), instant()->overlay());
+  EXPECT_TRUE(instant()->overlay()->IsLocal());
 }
 
 // Test that if Instant alters the input from URL to search, it's respected.
 IN_PROC_BROWSER_TEST_F(InstantExtendedTest, InputChangedFromURLToSearch) {
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
   FocusOmniboxAndWaitForInstantOverlayAndNTPSupport();
 
   content::WebContents* overlay = instant()->GetOverlayContents();
   EXPECT_TRUE(ExecuteScript("suggestions = ['mcqueen.com'];"));
 
@@ skipping 190 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());
 }
+
+class InstantExtendedFirstTabTest : public InProcessBrowserTest,
+                                  public InstantTestBase {

[Jered, 2013/05/05 15:08:00]

indent more

[David Black, 2013/05/05 20:02:42]

Done.

+ public:
+  InstantExtendedFirstTabTest() {}
+ protected:
+  virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
+    command_line->AppendSwitch(switches::kEnableInstantExtendedAPI);
+    command_line->AppendSwitch(switches::kDisableLocalFirstLoadNTP);
+  }
+};
+
+IN_PROC_BROWSER_TEST_F(
+    InstantExtendedFirstTabTest, RedirectToLocalOnLoadFailure) {
+  // Create a new window to test the first NTP load.
+  ui_test_utils::NavigateToURLWithDisposition(
+      browser(),
+      GURL(chrome::kChromeUINewTabURL),
+      NEW_WINDOW,
+      ui_test_utils::BROWSER_TEST_WAIT_FOR_BROWSER);
+
+  const BrowserList* native_browser_list = BrowserList::GetInstance(
+      chrome::HOST_DESKTOP_TYPE_NATIVE);
+  ASSERT_EQ(2u, native_browser_list->size());
+  set_browser(native_browser_list->get(1));
+
+  FocusOmniboxAndWaitForInstantOverlayAndNTPSupport();
+
+  // Also make sure our instant_tab_ is loaded.
+  if (!instant()->instant_tab_) {
+    content::WindowedNotificationObserver instant_tab_observer(
+        chrome::NOTIFICATION_INSTANT_TAB_SUPPORT_DETERMINED,
+        content::NotificationService::AllSources());
+    instant_tab_observer.Wait();
+  }
+
+  // NTP contents should be preloaded.
+  ASSERT_NE(static_cast<InstantNTP*>(NULL), instant()->ntp());
+  EXPECT_TRUE(instant()->ntp()->IsLocal());
+
+  // Overlay contents should be preloaded.
+  ASSERT_NE(static_cast<InstantOverlay*>(NULL), instant()->overlay());
+  EXPECT_TRUE(instant()->overlay()->IsLocal());
+
+  // Instant tab contents should be preloaded.
+  ASSERT_NE(static_cast<InstantTab*>(NULL), instant()->instant_tab());
+  EXPECT_TRUE(instant()->instant_tab()->IsLocal());
+}