Cleanup in components/search and chrome/browser/search

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"
@@ skipping 96 matching lines @@
     const EmbeddedSearchRequestParams& params) {
   DCHECK(prerender_handle_);
   DCHECK(prerender_contents());
   SearchTabHelper::FromWebContents(prerender_contents())->Submit(query, params);
 }
 
 bool InstantSearchPrerenderer::CanCommitQuery(
     content::WebContents* source,
     const base::string16& query) const {
   if (!source || query.empty() || !prerender_handle_ ||
-      !prerender_handle_->IsFinishedLoading() ||
-      !prerender_contents() || !QueryMatchesPrefetch(query)) {
+      !prerender_handle_->IsFinishedLoading() || !prerender_contents()) {
     return false;
   }
 
   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::GetForBrowserContext(profile_);
   if (search_terms.empty() || !params->target_contents ||
       !prerender_contents() || !prerender_manager ||
-      !QueryMatchesPrefetch(search_terms) ||
       params->disposition != WindowOpenDisposition::CURRENT_TAB) {
     Cancel();
     return false;
   }
 
   // Do not use prerendered page for renderer initiated search requests.
   if (params->is_renderer_initiated &&
       ui::PageTransitionCoreTypeIs(params->transition,
                                    ui::PAGE_TRANSITION_LINK)) {
     Cancel();
@@ skipping 30 matching lines @@
   // This handles the by-far-the-most-common cases while still being simple and
   // maintainable.
   return source && AutocompleteMatch::IsSearchType(match.type) &&
       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;
-}