Consolidate search terms extraction and Instant process determination.

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_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"
@@ skipping 94 matching lines @@
   EXPECT_FALSE(ui_test_utils::IsViewFocused(browser(), VIEW_ID_TAB_CONTAINER));
 
   EXPECT_EQ(preview_tab, instant()->GetPreviewContents());
 
   // Doing a search should also use the same preloaded page.
   SetOmniboxTextAndWaitForInstantToShow("query");
   EXPECT_TRUE(instant()->model()->mode().is_search_suggestions());
   EXPECT_EQ(preview_tab, instant()->GetPreviewContents());
 }
 
-// Test that Instant works when the URL is set via a TemplateURL (as opposed to
-// --instant-url).
-IN_PROC_BROWSER_TEST_F(InstantTest, SetWithTemplateURL) {
-  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()->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()->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
 // Test that the onchange event is dispatched upon typing in the omnibox.
 IN_PROC_BROWSER_TEST_F(InstantTest, MAYBE_OnChangeEvent) {
   ASSERT_NO_FATAL_FAILURE(SetupInstant());
   FocusOmniboxAndWaitForInstantSupport();
@@ skipping 870 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()));
 }