InstantExtended: Committed NTP

chrome/browser/instant/instant_browsertest.cc

 // Copyright 2012 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 "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/history/history_service_factory.h"
-#include "chrome/browser/instant/instant_loader.h"
+#include "chrome/browser/instant/instant_overlay.h"
 #include "chrome/browser/instant/instant_service.h"
 #include "chrome/browser/instant/instant_service_factory.h"
 #include "chrome/browser/instant/instant_test_utils.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/task_manager/task_manager.h"
 #include "chrome/browser/task_manager/task_manager_browsertest_util.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/interactive_test_utils.h"
 #include "chrome/test/base/ui_test_utils.h"
+#include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 class InstantTest : public InstantTestBase {
  protected:
   virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
     ASSERT_TRUE(test_server()->Start());
     instant_url_ = test_server()->GetURL("files/instant.html");
   }
 
+  void FocusOmniboxAndWaitForInstantSupport() {
+    content::WindowedNotificationObserver observer(
+        chrome::NOTIFICATION_INSTANT_OVERLAY_SUPPORT_DETERMINED,
+        content::NotificationService::AllSources());
+    FocusOmnibox();
+    observer.Wait();
+  }
+
   bool UpdateSearchState(content::WebContents* contents) WARN_UNUSED_RESULT {
     return GetIntFromJS(contents, "onvisibilitycalls", &onvisibilitycalls_) &&
            GetIntFromJS(contents, "onchangecalls", &onchangecalls_) &&
            GetIntFromJS(contents, "onsubmitcalls", &onsubmitcalls_) &&
            GetIntFromJS(contents, "oncancelcalls", &oncancelcalls_) &&
            GetIntFromJS(contents, "onresizecalls", &onresizecalls_) &&
            GetStringFromJS(contents, "value", &value_) &&
            GetBoolFromJS(contents, "verbatim", &verbatim_) &&
            GetIntFromJS(contents, "height", &height_);
   }
@@ skipping 14 matching lines @@
   ASSERT_NO_FATAL_FAILURE(SetupInstant());
 
   // Explicitly unfocus the omnibox.
   EXPECT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser()));
   ui_test_utils::ClickOnView(browser(), VIEW_ID_TAB_CONTAINER);
 
   EXPECT_TRUE(ui_test_utils::IsViewFocused(browser(), VIEW_ID_TAB_CONTAINER));
   EXPECT_FALSE(omnibox()->model()->has_focus());
 
   // Delete any existing preview.
-  instant()->loader_.reset();
+  instant()->overlay_.reset();
   EXPECT_FALSE(instant()->GetPreviewContents());
 
   // Refocus the omnibox. The InstantController should've preloaded Instant.
   FocusOmniboxAndWaitForInstantSupport();
 
   EXPECT_FALSE(ui_test_utils::IsViewFocused(browser(), VIEW_ID_TAB_CONTAINER));
   EXPECT_TRUE(omnibox()->model()->has_focus());
 
   content::WebContents* preview_tab = instant()->GetPreviewContents();
   EXPECT_TRUE(preview_tab);
 
   // Check that the page supports Instant, but it isn't showing.
-  EXPECT_TRUE(instant()->loader_->supports_instant());
+  EXPECT_TRUE(instant()->overlay_->supports_instant());
   EXPECT_FALSE(instant()->IsPreviewingSearchResults());
   EXPECT_TRUE(instant()->model()->mode().is_default());
 
   // Adding a new tab shouldn't delete or recreate the preview; otherwise,
   // what's the point of preloading?
   AddBlankTabAndShow(browser());
   EXPECT_EQ(preview_tab, instant()->GetPreviewContents());
 
   // Unfocusing and refocusing the omnibox should also preserve the preview.
   ui_test_utils::ClickOnView(browser(), VIEW_ID_TAB_CONTAINER);
@@ skipping 16 matching lines @@
   ASSERT_NO_FATAL_FAILURE(SetupInstantUsingTemplateURL());
 
   // Explicitly unfocus the omnibox.
   EXPECT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser()));
   ui_test_utils::ClickOnView(browser(), VIEW_ID_TAB_CONTAINER);
 
   EXPECT_TRUE(ui_test_utils::IsViewFocused(browser(), VIEW_ID_TAB_CONTAINER));
   EXPECT_FALSE(omnibox()->model()->has_focus());
 
   // Delete any existing preview.
-  instant()->loader_.reset();
+  instant()->overlay_.reset();
   EXPECT_FALSE(instant()->GetPreviewContents());
 
   // Refocus the omnibox. The InstantController should've preloaded Instant.
   FocusOmniboxAndWaitForInstantSupport();
 
   EXPECT_FALSE(ui_test_utils::IsViewFocused(browser(), VIEW_ID_TAB_CONTAINER));
   EXPECT_TRUE(omnibox()->model()->has_focus());
 
   content::WebContents* preview_tab = instant()->GetPreviewContents();
   EXPECT_TRUE(preview_tab);
 
   // Check that the page supports Instant, but it isn't showing.
-  EXPECT_TRUE(instant()->loader_->supports_instant());
+  EXPECT_TRUE(instant()->overlay_->supports_instant());
   EXPECT_FALSE(instant()->IsPreviewingSearchResults());
   EXPECT_TRUE(instant()->model()->mode().is_default());
 }
 
 // Flakes on Windows and Mac: http://crbug.com/170677
 #if defined(OS_WIN) || defined(OS_MACOSX)
 #define MAYBE_OnChangeEvent DISABLED_OnChangeEvent
 #else
 #define MAYBE_OnChangeEvent OnChangeEvent
 #endif
@@ skipping 63 matching lines @@
   EXPECT_EQ(std::string(chrome::kAboutBlankURL),
             omnibox()->model()->PermanentURL().spec());
 
   // Commit the search by pressing Enter.
   browser()->window()->GetLocationBar()->AcceptInput();
 
   // After the commit, Instant should not be showing.
   EXPECT_FALSE(instant()->IsPreviewingSearchResults());
   EXPECT_TRUE(instant()->model()->mode().is_default());
 
-  // The old loader is deleted and a new one is created.
+  // The old overlay is deleted and a new one is created.
   EXPECT_TRUE(instant()->GetPreviewContents());
   EXPECT_NE(instant()->GetPreviewContents(), preview_tab);
 
   // Check that the current active tab is indeed what was once the preview.
   EXPECT_EQ(preview_tab, browser()->tab_strip_model()->GetActiveWebContents());
 
   // We should have two navigation entries, one for the NTP, and one for the
   // Instant search that was committed.
   EXPECT_EQ(2, preview_tab->GetController().GetEntryCount());
 
@@ skipping 39 matching lines @@
   EXPECT_EQ(std::string(chrome::kAboutBlankURL),
             omnibox()->model()->PermanentURL().spec());
 
   // Commit the search by clicking on the preview.
   ui_test_utils::ClickOnView(browser(), VIEW_ID_TAB_CONTAINER);
 
   // After the commit, Instant should not be showing.
   EXPECT_FALSE(instant()->IsPreviewingSearchResults());
   EXPECT_TRUE(instant()->model()->mode().is_default());
 
-  // The old loader is deleted and a new one is created.
+  // The old overlay is deleted and a new one is created.
   EXPECT_TRUE(instant()->GetPreviewContents());
   EXPECT_NE(instant()->GetPreviewContents(), preview_tab);
 
   // Check that the current active tab is indeed what was once the preview.
   EXPECT_EQ(preview_tab, browser()->tab_strip_model()->GetActiveWebContents());
 
   // We should have two navigation entries, one for the NTP, and one for the
   // Instant search that was committed.
   EXPECT_EQ(2, preview_tab->GetController().GetEntryCount());
 
@@ skipping 483 matching lines @@
   chrome::NewEmptyWindow(browser()->profile());
   observer.WaitUntilDesiredPreviewState();
 
   // Even though we just created a new Browser object (for the new window), the
   // browser() accessor should still give us the first window's Browser object.
   EXPECT_EQ(previous_window, browser());
   EXPECT_FALSE(instant()->IsPreviewingSearchResults());
   EXPECT_TRUE(instant()->model()->mode().is_default());
 }
 
-// Test that the Instant loader is recreated when all these conditions are met:
-// - The stale loader timer has fired.
+// Test that the Instant overlay is recreated when all these conditions are met:
+// - The stale overlay timer has fired.
 // - The preview is not showing.
 // - The omnibox doesn't have focus.
-IN_PROC_BROWSER_TEST_F(InstantTest, InstantLoaderRefresh) {
+IN_PROC_BROWSER_TEST_F(InstantTest, InstantOverlayRefresh) {
   ASSERT_NO_FATAL_FAILURE(SetupInstant());
   FocusOmniboxAndWaitForInstantSupport();
 
   // The preview is refreshed only after all three conditions above are met.
   SetOmniboxTextAndWaitForInstantToShow("query");
-  instant()->stale_loader_timer_.Stop();
-  instant()->OnStaleLoader();
-  EXPECT_TRUE(instant()->loader_->supports_instant());
-  instant()->HideLoader();
-  EXPECT_TRUE(instant()->loader_->supports_instant());
+  instant()->overlay_->is_stale_ = true;
+  instant()->ReloadOverlayIfStale();
+  EXPECT_TRUE(instant()->overlay_->supports_instant());
+  instant()->HideOverlay();
+  EXPECT_TRUE(instant()->overlay_->supports_instant());
   instant()->OmniboxFocusChanged(OMNIBOX_FOCUS_NONE,
                                  OMNIBOX_FOCUS_CHANGE_EXPLICIT, NULL);
-  EXPECT_FALSE(instant()->loader_->supports_instant());
+  EXPECT_FALSE(instant()->overlay_->supports_instant());
 
   // Try with a different ordering.
   SetOmniboxTextAndWaitForInstantToShow("query");
-  instant()->stale_loader_timer_.Stop();
-  instant()->OnStaleLoader();
-  EXPECT_TRUE(instant()->loader_->supports_instant());
+  instant()->overlay_->is_stale_ = true;
+  instant()->ReloadOverlayIfStale();
+  EXPECT_TRUE(instant()->overlay_->supports_instant());
   instant()->OmniboxFocusChanged(OMNIBOX_FOCUS_NONE,
                                  OMNIBOX_FOCUS_CHANGE_EXPLICIT, NULL);
-  // TODO(sreeram): Currently, OmniboxLostFocus() calls HideLoader(). When it
+  // TODO(sreeram): Currently, OmniboxLostFocus() calls HideOverlay(). When it
   // stops hiding the preview eventually, uncomment these two lines:
-  //     EXPECT_TRUE(instant()->loader_->supports_instant());
-  //     instant()->HideLoader();
-  EXPECT_FALSE(instant()->loader_->supports_instant());
+  //     EXPECT_TRUE(instant()->overlay_->supports_instant());
+  //     instant()->HideOverlay();
+  EXPECT_FALSE(instant()->overlay_->supports_instant());
 }
 
 // Test that suggestions are case insensitive. http://crbug.com/150728
 IN_PROC_BROWSER_TEST_F(InstantTest, SuggestionsAreCaseInsensitive) {
   ASSERT_NO_FATAL_FAILURE(SetupInstant());
   FocusOmniboxAndWaitForInstantSupport();
 
   EXPECT_TRUE(ExecuteScript("suggestion = [ { value: 'INSTANT' } ]"));
 
   SetOmniboxTextAndWaitForInstantToShow("in");
@@ skipping 89 matching lines @@
                            &active_tab_onvisibilitycalls));
   EXPECT_EQ(0, active_tab_onvisibilitycalls);
 
   // Commit the search by pressing Alt-Enter.
   omnibox()->model()->AcceptInput(NEW_FOREGROUND_TAB, false);
 
   // After the commit, Instant should not be showing.
   EXPECT_FALSE(instant()->IsPreviewingSearchResults());
   EXPECT_TRUE(instant()->model()->mode().is_default());
 
-  // The old loader is deleted and a new one is created.
+  // The old overlay is deleted and a new one is created.
   EXPECT_TRUE(instant()->GetPreviewContents());
   EXPECT_NE(instant()->GetPreviewContents(), preview_tab);
 
   // Check that we have two tabs and that the new active tab is indeed what was
   // once the preview. The preview tab should have just one navigation entry,
   // for the Instant search that was committed.
   EXPECT_EQ(2, browser()->tab_strip_model()->count());
   EXPECT_EQ(preview_tab, browser()->tab_strip_model()->GetActiveWebContents());
   EXPECT_EQ(1, preview_tab->GetController().GetEntryCount());
 
@@ skipping 33 matching lines @@
   SetOmniboxText("ins");
   EXPECT_EQ(ASCIIToUTF16("tant"), omnibox()->GetInstantSuggestion());
 
   SetOmniboxText("in");
   EXPECT_EQ(ASCIIToUTF16("stant"), omnibox()->GetInstantSuggestion());
 
   SetOmniboxText("insane");
   EXPECT_EQ(ASCIIToUTF16(""), omnibox()->GetInstantSuggestion());
 }
 
-// Test that instant loader is recreated if it gets destroyed.
+// Test that instant overlay is recreated if it gets destroyed.
 IN_PROC_BROWSER_TEST_F(InstantTest, InstantRenderViewGone) {
   ASSERT_NO_FATAL_FAILURE(SetupInstant());
   FocusOmniboxAndWaitForInstantSupport();
 
   // Type partial query, get suggestion to show.
   SetOmniboxTextAndWaitForInstantToShow("q");
   EXPECT_EQ(ASCIIToUTF16("query suggestion"), omnibox()->GetText());
 
   // Kill the instant renderer and wait for instant support again.
   KillInstantRenderView();
@@ skipping 31 matching lines @@
   content::WebContents* active_tab =
       browser()->tab_strip_model()->GetActiveWebContents();
   EXPECT_TRUE(instant_service->IsInstantProcess(
       active_tab->GetRenderProcessHost()->GetID()));
 
   // Navigating away should change the process.
   ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUINewTabURL));
   EXPECT_FALSE(instant_service->IsInstantProcess(
       active_tab->GetRenderProcessHost()->GetID()));
 }