Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / omnibox / omnibox_current_page_delegate_impl.cc

diff --git a/src/chrome/browser/ui/omnibox/omnibox_current_page_delegate_impl.cc b/src/chrome/browser/ui/omnibox/omnibox_current_page_delegate_impl.cc
index 345a9e8..2d3b4db 100644 (file)
--- a/src/chrome/browser/ui/omnibox/omnibox_current_page_delegate_impl.cc
+++ b/src/chrome/browser/ui/omnibox/omnibox_current_page_delegate_impl.cc
@@ -5,18 +5,19 @@
 #include "chrome/browser/ui/omnibox/omnibox_current_page_delegate_impl.h"
 
 #include "base/strings/utf_string_conversions.h"
-#include "chrome/browser/autocomplete/autocomplete_match.h"
 #include "chrome/browser/extensions/api/omnibox/omnibox_api.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/search/search.h"
-#include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/sessions/session_tab_helper.h"
 #include "chrome/browser/ui/omnibox/omnibox_edit_controller.h"
 #include "chrome/browser/ui/search/instant_search_prerenderer.h"
 #include "chrome/browser/ui/search/search_tab_helper.h"
+#include "components/omnibox/autocomplete_match.h"
+#include "components/search/search.h"
+#include "components/search_engines/template_url_service.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/web_contents.h"
 #include "ui/base/window_open_disposition.h"
@@ -120,18 +121,18 @@ void OmniboxCurrentPageDelegateImpl::DoPrerender(
 
 void OmniboxCurrentPageDelegateImpl::SetSuggestionToPrefetch(
       const InstantSuggestion& suggestion) {
+  DCHECK(chrome::IsInstantExtendedAPIEnabled());
   content::WebContents* web_contents = controller_->GetWebContents();
   if (web_contents &&
       SearchTabHelper::FromWebContents(web_contents)->IsSearchResultsPage()) {
-    if (chrome::ShouldPrefetchSearchResultsOnSRP() ||
-        chrome::ShouldPrefetchSearchResults()) {
+    if (chrome::ShouldPrefetchSearchResultsOnSRP()) {
       SearchTabHelper::FromWebContents(web_contents)->
           SetSuggestionToPrefetch(suggestion);
     }
-  } else if (chrome::ShouldPrefetchSearchResults()) {
-      InstantSearchPrerenderer* prerenderer =
-          InstantSearchPrerenderer::GetForProfile(profile_);
-      if (prerenderer)
-        prerenderer->Prerender(suggestion);
+  } else {
+    InstantSearchPrerenderer* prerenderer =
+        InstantSearchPrerenderer::GetForProfile(profile_);
+    if (prerenderer)
+      prerenderer->Prerender(suggestion);
   }
 }