Cleanup: Remove the last traces of Instant Search on Android

chrome/browser/android/omnibox/omnibox_prerender.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/android/omnibox/omnibox_prerender.h"
 
 #include "base/android/jni_string.h"
 #include "base/logging.h"
 #include "chrome/browser/android/tab_android.h"
 #include "chrome/browser/predictors/autocomplete_action_predictor.h"
 #include "chrome/browser/predictors/autocomplete_action_predictor_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_android.h"
-#include "chrome/browser/ui/search/instant_search_prerenderer.h"
 #include "components/omnibox/browser/autocomplete_match.h"
 #include "components/omnibox/browser/autocomplete_result.h"
 #include "content/public/browser/web_contents.h"
 #include "jni/OmniboxPrerender_jni.h"
 #include "url/gurl.h"
 
 using base::android::JavaParamRef;
 using predictors::AutocompleteActionPredictor;
 using predictors::AutocompleteActionPredictorFactory;
 
@@ skipping 59 matching lines @@
   if (!autocomplete_result)
     return;
   if (!profile)
     return;
 
   const AutocompleteResult::const_iterator default_match(
       autocomplete_result->default_match());
   if (default_match == autocomplete_result->end())
     return;
 
+  AutocompleteActionPredictor* action_predictor =
+      AutocompleteActionPredictorFactory::GetForProfile(profile);
+  if (!action_predictor)
+    return;
+
+  action_predictor->
+      RegisterTransitionalMatches(url_string, *autocomplete_result);
   AutocompleteActionPredictor::Action recommended_action =
-      AutocompleteActionPredictor::ACTION_NONE;
-  InstantSearchPrerenderer* prerenderer =
-      InstantSearchPrerenderer::GetForProfile(profile);
-  if (prerenderer &&
-      prerenderer->IsAllowed(*default_match, web_contents)) {
-    recommended_action = AutocompleteActionPredictor::ACTION_PRERENDER;
-  } else {
-    AutocompleteActionPredictor* action_predictor =
-        AutocompleteActionPredictorFactory::GetForProfile(profile);
-    if (!action_predictor)
-      return;
-
-    if (action_predictor) {
-      action_predictor->
-          RegisterTransitionalMatches(url_string, *autocomplete_result);
-      recommended_action =
-          action_predictor->RecommendAction(url_string, *default_match);
-    }
-  }
+      action_predictor->RecommendAction(url_string, *default_match);
 
   GURL current_url = GURL(current_url_string);
   switch (recommended_action) {
     case AutocompleteActionPredictor::ACTION_PRERENDER:
       // Ask for prerendering if the destination URL is different than the
       // current URL.
       if (default_match->destination_url != current_url) {
         DoPrerender(
             *default_match,
             profile,
@@ skipping 14 matching lines @@
 void OmniboxPrerender::DoPrerender(const AutocompleteMatch& match,
                                    Profile* profile,
                                    content::WebContents* web_contents) {
   DCHECK(profile);
   if (!profile)
     return;
   DCHECK(web_contents);
   if (!web_contents)
     return;
   gfx::Rect container_bounds = web_contents->GetContainerBounds();
-  InstantSearchPrerenderer* prerenderer =
-      InstantSearchPrerenderer::GetForProfile(profile);
-  if (prerenderer && prerenderer->IsAllowed(match, web_contents)) {
-    prerenderer->Init(
-        web_contents->GetController().GetDefaultSessionStorageNamespace(),
-        container_bounds.size());
-    return;
-  }
   predictors::AutocompleteActionPredictorFactory::GetForProfile(profile)->
       StartPrerendering(
           match.destination_url,
           web_contents->GetController().GetDefaultSessionStorageNamespace(),
           container_bounds.size());
 }