Removes different instant behaviors that are no longer used.

chrome/browser/instant/instant_browsertest.cc

 // Copyright (c) 2011 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 "base/command_line.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete_edit_view.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_window.h"
 #include "chrome/browser/instant/instant_controller.h"
 #include "chrome/browser/instant/instant_loader.h"
 #include "chrome/browser/instant/instant_loader_manager.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/renderer_host/render_widget_host_view.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_model.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/omnibox/location_bar.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
-#include "chrome/common/chrome_switches.h"
 #include "chrome/test/in_process_browser_test.h"
 #include "chrome/test/ui_test_utils.h"
 
 #define EXPECT_STR_EQ(ascii, utf16) \
   EXPECT_EQ(ASCIIToWide(ascii), UTF16ToWide(utf16))
 
 class InstantTest : public InProcessBrowserTest {
  public:
   InstantTest()
       : location_bar_(NULL),
         preview_(NULL) {
     set_show_window(true);
     EnableDOMAutomation();
   }
 
+  void EnableInstant() {
+    InstantController::Enable(browser()->profile());
+  }
+
   void SetupInstantProvider(const std::string& page) {
     TemplateURLModel* model = browser()->profile()->GetTemplateURLModel();
     ASSERT_TRUE(model);
 
     if (!model->loaded()) {
       model->Load();
       ui_test_utils::WaitForNotification(
           NotificationType::TEMPLATE_URL_MODEL_LOADED);
     }
 
@@ skipping 214 matching lines @@
   }
 
   // Sends a message to the renderer and waits for the response to come back to
   // the browser.
   void WaitForMessageToBeProcessedByRenderer(TabContentsWrapper* tab) {
     ASSERT_NO_FATAL_FAILURE(
         CheckBoolValueFromJavascript(true, "true", tab->tab_contents()));
   }
 
  protected:
-  virtual void SetUpCommandLine(CommandLine* command_line) {
-    command_line->AppendSwitch(switches::kEnablePredictiveInstant);
-  }
-
   LocationBar* location_bar_;
   TabContents* preview_;
 };
 
 // TODO(tonyg): Add the following tests:
 // - Test that the search box API is not populated for pages other than the
 //   default search provider.
 // - Test resize events.
 
 // Verify that the onchange event is dispatched upon typing in the box.
 IN_PROC_BROWSER_TEST_F(InstantTest, OnChangeEvent) {
   ASSERT_TRUE(test_server()->Start());
+  EnableInstant();
   ASSERT_NO_FATAL_FAILURE(SetupInstantProvider("search.html"));
   ASSERT_NO_FATAL_FAILURE(SetupLocationBar());
   ASSERT_NO_FATAL_FAILURE(SetupPreview());
 
   ASSERT_NO_FATAL_FAILURE(SetLocationBarText(L"abc"));
 
   // Check that the value is reflected and onchange is called.
   EXPECT_EQ("true 0 0 1 1 a false abc false 3 3",
       GetSearchStateAsString(preview_));
 }
 
 IN_PROC_BROWSER_TEST_F(InstantTest, SetSuggestionsArrayOfStrings) {
   ASSERT_TRUE(test_server()->Start());
+  EnableInstant();
   ASSERT_NO_FATAL_FAILURE(SetupInstantProvider("search.html"));
   ASSERT_NO_FATAL_FAILURE(SetupLocationBar());
   ASSERT_NO_FATAL_FAILURE(SetupPreview());
 
   SetSuggestionsJavascriptArgument(preview_, "['abcde', 'unused']");
   ASSERT_NO_FATAL_FAILURE(SetLocationBarText(L"abc"));
   EXPECT_STR_EQ("abcde", GetSuggestion());
 }
 
 IN_PROC_BROWSER_TEST_F(InstantTest, SetSuggestionsEmptyArray) {
   ASSERT_TRUE(test_server()->Start());
+  EnableInstant();
   ASSERT_NO_FATAL_FAILURE(SetupInstantProvider("search.html"));
   ASSERT_NO_FATAL_FAILURE(SetupLocationBar());
   ASSERT_NO_FATAL_FAILURE(SetupPreview());
 
   SetSuggestionsJavascriptArgument(preview_, "[]");
   ASSERT_NO_FATAL_FAILURE(SetLocationBarText(L"abc"));
   EXPECT_STR_EQ("", GetSuggestion());
 }
 
 IN_PROC_BROWSER_TEST_F(InstantTest, SetSuggestionsValidJson) {
   ASSERT_TRUE(test_server()->Start());
+  EnableInstant();
   ASSERT_NO_FATAL_FAILURE(SetupInstantProvider("search.html"));
   ASSERT_NO_FATAL_FAILURE(SetupLocationBar());
   ASSERT_NO_FATAL_FAILURE(SetupPreview());
 
   SetSuggestionsJavascriptArgument(
       preview_,
       "{suggestions:[{value:'abcdefg'},{value:'unused'}]}");
   ASSERT_NO_FATAL_FAILURE(SetLocationBarText(L"abc"));
   EXPECT_STR_EQ("abcdefg", GetSuggestion());
 }
 
 IN_PROC_BROWSER_TEST_F(InstantTest, SetSuggestionsInvalidSuggestions) {
   ASSERT_TRUE(test_server()->Start());
+  EnableInstant();
   ASSERT_NO_FATAL_FAILURE(SetupInstantProvider("search.html"));
   ASSERT_NO_FATAL_FAILURE(SetupLocationBar());
   ASSERT_NO_FATAL_FAILURE(SetupPreview());
 
   SetSuggestionsJavascriptArgument(
       preview_,
       "{suggestions:{value:'abcdefg'}}");
   ASSERT_NO_FATAL_FAILURE(SetLocationBarText(L"abc"));
   EXPECT_STR_EQ("", GetSuggestion());
 }
 
 IN_PROC_BROWSER_TEST_F(InstantTest, SetSuggestionsEmptyJson) {
   ASSERT_TRUE(test_server()->Start());
+  EnableInstant();
   ASSERT_NO_FATAL_FAILURE(SetupInstantProvider("search.html"));
   ASSERT_NO_FATAL_FAILURE(SetupLocationBar());
   ASSERT_NO_FATAL_FAILURE(SetupPreview());
 
   SetSuggestionsJavascriptArgument(preview_, "{}");
   ASSERT_NO_FATAL_FAILURE(SetLocationBarText(L"abc"));
   EXPECT_STR_EQ("", GetSuggestion());
 }
 
 IN_PROC_BROWSER_TEST_F(InstantTest, SetSuggestionsEmptySuggestions) {
   ASSERT_TRUE(test_server()->Start());
+  EnableInstant();
   ASSERT_NO_FATAL_FAILURE(SetupInstantProvider("search.html"));
   ASSERT_NO_FATAL_FAILURE(SetupLocationBar());
   ASSERT_NO_FATAL_FAILURE(SetupPreview());
 
   SetSuggestionsJavascriptArgument(preview_, "{suggestions:[]}");
   ASSERT_NO_FATAL_FAILURE(SetLocationBarText(L"abc"));
   EXPECT_STR_EQ("", GetSuggestion());
 }
 
 IN_PROC_BROWSER_TEST_F(InstantTest, SetSuggestionsEmptySuggestion) {
   ASSERT_TRUE(test_server()->Start());
+  EnableInstant();
   ASSERT_NO_FATAL_FAILURE(SetupInstantProvider("search.html"));
   ASSERT_NO_FATAL_FAILURE(SetupLocationBar());
   ASSERT_NO_FATAL_FAILURE(SetupPreview());
 
   SetSuggestionsJavascriptArgument(preview_, "{suggestions:[{}]}");
   ASSERT_NO_FATAL_FAILURE(SetLocationBarText(L"abc"));
   EXPECT_STR_EQ("", GetSuggestion());
 }
 
 // Verify instant preview is shown correctly for a non-search query.
 IN_PROC_BROWSER_TEST_F(InstantTest, ShowPreviewNonSearch) {
   ASSERT_TRUE(test_server()->Start());
+  EnableInstant();
   GURL url(test_server()->GetURL("files/instant/empty.html"));
   ASSERT_NO_FATAL_FAILURE(SetLocationBarText(UTF8ToWide(url.spec())));
   // The preview should be active and showing.
   ASSERT_TRUE(browser()->instant()->is_active());
   ASSERT_TRUE(browser()->instant()->is_displayable());
   ASSERT_TRUE(browser()->instant()->IsCurrent());
   ASSERT_TRUE(browser()->instant()->GetPreviewContents());
   RenderWidgetHostView* rwhv =
       browser()->instant()->GetPreviewContents()->tab_contents()->
       GetRenderWidgetHostView();
   ASSERT_TRUE(rwhv);
   ASSERT_TRUE(rwhv->IsShowing());
 }
 
 // Transition from non-search to search and make sure everything is shown
 // correctly.
 IN_PROC_BROWSER_TEST_F(InstantTest, NonSearchToSearch) {
   ASSERT_TRUE(test_server()->Start());
+  EnableInstant();
   GURL url(test_server()->GetURL("files/instant/empty.html"));
   ASSERT_NO_FATAL_FAILURE(SetLocationBarText(UTF8ToWide(url.spec())));
   // The preview should be active and showing.
   ASSERT_TRUE(browser()->instant()->is_active());
   ASSERT_TRUE(browser()->instant()->is_displayable());
   TabContentsWrapper* initial_tab = browser()->instant()->GetPreviewContents();
   ASSERT_TRUE(initial_tab);
   RenderWidgetHostView* rwhv =
       initial_tab->tab_contents()->GetRenderWidgetHostView();
   ASSERT_TRUE(rwhv);
@@ skipping 60 matching lines @@
 // Showing as flaky on Mac
 // http://crbug.com/70860
 #define MAYBE_SearchServerDoesntSupportInstant \
     DISABLED_SearchServerDoesntSupportInstant
 #else
 #define MAYBE_SearchServerDoesntSupportInstant \
     SearchServerDoesntSupportInstant
 #endif
 IN_PROC_BROWSER_TEST_F(InstantTest, MAYBE_SearchServerDoesntSupportInstant) {
   ASSERT_TRUE(test_server()->Start());
+  EnableInstant();
   ASSERT_NO_FATAL_FAILURE(SetupInstantProvider("empty.html"));
   ASSERT_NO_FATAL_FAILURE(FindLocationBar());
   location_bar_->location_entry()->SetUserText(ASCIIToUTF16("a"));
   ASSERT_TRUE(browser()->instant());
   // Because we typed in a search string we should think we're showing instant
   // results.
   EXPECT_TRUE(browser()->instant()->IsShowingInstant());
   // But because we're waiting to determine if the page really supports instant
   // we shouldn't be showing the preview.
   EXPECT_FALSE(browser()->instant()->is_displayable());
@@ skipping 17 matching lines @@
 // http://crbug.com/70810
 #define MAYBE_NonSearchToSearchDoesntSupportInstant \
     DISABLED_NonSearchToSearchDoesntSupportInstant
 #else
 #define MAYBE_NonSearchToSearchDoesntSupportInstant \
     NonSearchToSearchDoesntSupportInstant
 #endif
 IN_PROC_BROWSER_TEST_F(InstantTest,
                        MAYBE_NonSearchToSearchDoesntSupportInstant) {
   ASSERT_TRUE(test_server()->Start());
+  EnableInstant();
   ASSERT_NO_FATAL_FAILURE(SetupInstantProvider("empty.html"));
   GURL url(test_server()->GetURL("files/instant/empty.html"));
   ASSERT_NO_FATAL_FAILURE(SetLocationBarText(UTF8ToWide(url.spec())));
   // The preview should be active and showing.
   ASSERT_TRUE(browser()->instant()->is_displayable());
   ASSERT_TRUE(browser()->instant()->is_active());
   TabContentsWrapper* initial_tab = browser()->instant()->GetPreviewContents();
   ASSERT_TRUE(initial_tab);
   RenderWidgetHostView* rwhv =
       initial_tab->tab_contents()->GetRenderWidgetHostView();
@@ skipping 17 matching lines @@
   ui_test_utils::WaitForNotification(NotificationType::TAB_CLOSED);
   EXPECT_FALSE(browser()->instant()->IsShowingInstant());
   EXPECT_FALSE(browser()->instant()->is_displayable());
   // But because the omnibox is still open, instant should be active.
   ASSERT_TRUE(browser()->instant()->is_active());
 }
 
 // Verifies the page was told a non-zero height.
 IN_PROC_BROWSER_TEST_F(InstantTest, ValidHeight) {
   ASSERT_TRUE(test_server()->Start());
+  EnableInstant();
   ASSERT_NO_FATAL_FAILURE(SetupInstantProvider("search.html"));
   ASSERT_NO_FATAL_FAILURE(SetupLocationBar());
   ASSERT_NO_FATAL_FAILURE(SetupPreview());
 
   ASSERT_NO_FATAL_FAILURE(SetLocationBarText(L"abc"));
 
   int height;
 
   // searchBox height is not yet set during initial load.
   ASSERT_TRUE(GetIntFromJavascript(preview_,
       "window.beforeLoadSearchBox.height",
       &height));
   EXPECT_EQ(0, height);
 
   // searchBox height is available by the time the page loads.
   ASSERT_TRUE(GetIntFromJavascript(preview_,
       "window.chrome.searchBox.height",
       &height));
   EXPECT_GT(height, 0);
 }
 
 // Verifies that if the server returns a 403 we don't show the preview and
 // query the host again.
 IN_PROC_BROWSER_TEST_F(InstantTest, HideOn403) {
   ASSERT_TRUE(test_server()->Start());
+  EnableInstant();
   GURL url(test_server()->GetURL("files/instant/403.html"));
   ASSERT_NO_FATAL_FAILURE(FindLocationBar());
   location_bar_->location_entry()->SetUserText(UTF8ToUTF16(url.spec()));
   // The preview shouldn't be showing, but it should be loading.
   ASSERT_TRUE(browser()->instant()->GetPreviewContents());
   ASSERT_TRUE(browser()->instant()->is_active());
   ASSERT_FALSE(browser()->instant()->is_displayable());
 
   // When instant sees the 403, it should close the tab.
   ui_test_utils::WaitForNotification(NotificationType::TAB_CLOSED);
   ASSERT_FALSE(browser()->instant()->GetPreviewContents());
   ASSERT_TRUE(browser()->instant()->is_active());
   ASSERT_FALSE(browser()->instant()->is_displayable());
 
   // Try loading another url on the server. Instant shouldn't create a new tab
   // as the server returned 403.
   GURL url2(test_server()->GetURL("files/instant/empty.html"));
   location_bar_->location_entry()->SetUserText(UTF8ToUTF16(url2.spec()));
   ASSERT_FALSE(browser()->instant()->GetPreviewContents());
   ASSERT_TRUE(browser()->instant()->is_active());
   ASSERT_FALSE(browser()->instant()->is_displayable());
 }
 
 // Verify that the onsubmit event is dispatched upon pressing enter.
 IN_PROC_BROWSER_TEST_F(InstantTest, OnSubmitEvent) {
   ASSERT_TRUE(test_server()->Start());
+  EnableInstant();
   ASSERT_NO_FATAL_FAILURE(SetupInstantProvider("search.html"));
 
   ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser()));
   ASSERT_NO_FATAL_FAILURE(SetupLocationBar());
   ASSERT_NO_FATAL_FAILURE(SetupPreview());
 
   ASSERT_NO_FATAL_FAILURE(SetLocationBarText(L"abc"));
   ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_RETURN));
 
   // Check that the preview contents have been committed.
   ASSERT_FALSE(browser()->instant()->GetPreviewContents());
   ASSERT_FALSE(browser()->instant()->is_active());
   TabContents* contents = browser()->GetSelectedTabContents();
   ASSERT_TRUE(contents);
 
   // Check that the value is reflected and onsubmit is called.
   EXPECT_EQ("true 1 0 1 1 a false abc true 3 3",
       GetSearchStateAsString(preview_));
 }
 
 // Verify that the oncancel event is dispatched upon losing focus.
 IN_PROC_BROWSER_TEST_F(InstantTest, OnCancelEvent) {
   ASSERT_TRUE(test_server()->Start());
+  EnableInstant();
   ASSERT_NO_FATAL_FAILURE(SetupInstantProvider("search.html"));
 
   ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser()));
   ASSERT_NO_FATAL_FAILURE(SetupLocationBar());
   ASSERT_NO_FATAL_FAILURE(SetupPreview());
 
   ASSERT_NO_FATAL_FAILURE(SetLocationBarText(L"abc"));
   ASSERT_NO_FATAL_FAILURE(ui_test_utils::ClickOnView(browser(),
                                                      VIEW_ID_TAB_CONTAINER));
 
   // Check that the preview contents have been committed.
   ASSERT_FALSE(browser()->instant()->GetPreviewContents());
   ASSERT_FALSE(browser()->instant()->is_active());
   TabContents* contents = browser()->GetSelectedTabContents();
   ASSERT_TRUE(contents);
 
   // Check that the value is reflected and oncancel is called.
   EXPECT_EQ("true 0 1 1 1 a false abc false 3 3",
       GetSearchStateAsString(preview_));
 }
 
 #if !defined(OS_MACOSX)
 // Only passes on Mac.  http://crbug.com/66850
 #define MAYBE_TabKey FAILS_TabKey
 #else
 #define MAYBE_TabKey TabKey
 #endif
 IN_PROC_BROWSER_TEST_F(InstantTest, MAYBE_TabKey) {
   ASSERT_TRUE(test_server()->Start());
+  EnableInstant();
   ASSERT_NO_FATAL_FAILURE(SetupInstantProvider("search.html"));
 
   ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser()));
   ASSERT_NO_FATAL_FAILURE(SetupLocationBar());
   ASSERT_NO_FATAL_FAILURE(SetupPreview());
 
   ASSERT_NO_FATAL_FAILURE(SetLocationBarText(L"abc"));
 
   // Pressing tab to convert instant suggest into inline autocomplete.
   ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_TAB));
 
   ASSERT_EQ(ASCIIToUTF16("abcdef"), location_bar_->location_entry()->GetText());
 
   EXPECT_EQ("true 0 0 2 2 a false abcdef false 6 6",
       GetSearchStateAsString(preview_));
 
   // Pressing tab again to accept the current instant preview.
   ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_TAB));
 
   // Check that the preview contents have been committed.
   ASSERT_FALSE(browser()->instant()->GetPreviewContents());
   ASSERT_FALSE(browser()->instant()->is_active());
   TabContents* contents = browser()->GetSelectedTabContents();
   ASSERT_TRUE(contents);
 
   // Check that the value is reflected and onsubmit is called.
   EXPECT_EQ("true 1 0 2 2 a false abcdef true 6 6",
       GetSearchStateAsString(preview_));
 }