Remove SearchTabHelper::IsSearchResultsPage

chrome/browser/ui/search/instant_search_prerenderer.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 "chrome/browser/ui/search/instant_search_prerenderer.h"
 
 #include <utility>
 
 #include "chrome/browser/prerender/prerender_handle.h"
 #include "chrome/browser/prerender/prerender_manager.h"
 #include "chrome/browser/prerender/prerender_manager_factory.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_factory.h"
 #include "chrome/browser/ui/browser_navigator_params.h"
 #include "chrome/browser/ui/search/search_tab_helper.h"
 #include "components/omnibox/browser/autocomplete_match.h"
 #include "components/search/search.h"
 #include "components/search_engines/template_url_service.h"
 
 namespace {
 
-// Returns true if the underlying page supports Instant search.
-bool PageSupportsInstantSearch(content::WebContents* contents) {
-  // Search results page supports Instant search.
-  return SearchTabHelper::FromWebContents(contents)->IsSearchResultsPage();
-}
-
 // Returns true if |match| is associated with the default search provider.
 bool MatchIsFromDefaultSearchProvider(const AutocompleteMatch& match,
                                       Profile* profile) {
   DCHECK(profile);
   TemplateURLService* template_url_service =
       TemplateURLServiceFactory::GetForProfile(profile);
   return match.GetTemplateURL(template_url_service, false) ==
       template_url_service->GetDefaultSearchProvider();
 }
 
@@ skipping 78 matching lines @@
 
 bool InstantSearchPrerenderer::CanCommitQuery(
     content::WebContents* source,
     const base::string16& query) const {
   if (!source || query.empty() || !prerender_handle_ ||
       !prerender_handle_->IsFinishedLoading() ||
       !prerender_contents() || !QueryMatchesPrefetch(query)) {
     return false;
   }
 
-  // InstantSearchPrerenderer can commit query to the prerendered page only if
-  // the underlying |source| page doesn't support Instant search.
-  return !PageSupportsInstantSearch(source);
+  return true;
 }
 
 bool InstantSearchPrerenderer::UsePrerenderedPage(
     const GURL& url,
     chrome::NavigateParams* params) {
   base::string16 search_terms =
       search::ExtractSearchTermsFromURL(profile_, url);
   prerender::PrerenderManager* prerender_manager =
       prerender::PrerenderManagerFactory::GetForProfile(profile_);
   if (search_terms.empty() || !params->target_contents ||
@@ skipping 35 matching lines @@
   // there's no way to pass them to the prerendered page, and worse, if the URL
   // does something like specifying params in both the query and ref sections of
   // the URL (as Google URLs often do), it can quickly become impossible to
   // figure out how to correctly tease out the right param names and values to
   // send.  Rather than try and write parsing code to deal with all these kinds
   // of cases, for various different search engines, including accommodating
   // changing behavior over time, we do the simple restriction described above.
   // This handles the by-far-the-most-common cases while still being simple and
   // maintainable.
   return source && AutocompleteMatch::IsSearchType(match.type) &&
-      MatchIsFromDefaultSearchProvider(match, profile_) &&
-      !PageSupportsInstantSearch(source);
+      MatchIsFromDefaultSearchProvider(match, profile_);
 }
 
 content::WebContents* InstantSearchPrerenderer::prerender_contents() const {
   return (prerender_handle_ && prerender_handle_->contents()) ?
       prerender_handle_->contents()->prerender_contents() : NULL;
 }
 
 bool InstantSearchPrerenderer::QueryMatchesPrefetch(
     const base::string16& query) const {
   return search::ShouldReuseInstantSearchBasePage() ||
          last_instant_suggestion_.text == query;
 }