Omnibox - Speed Up ZeroSuggest

If query extraction is not enabled (which is the case of everybody
at the moment), then zerosuggest can skip classifying the input.

BUG=619235

Review-Url: https://codereview.chromium.org/2108903002
Cr-Commit-Position: refs/heads/master@{#403494}
diff --git a/components/omnibox/browser/zero_suggest_provider.cc b/components/omnibox/browser/zero_suggest_provider.cc
index 442e07d..32994b5d 100644
--- a/components/omnibox/browser/zero_suggest_provider.cc
+++ b/components/omnibox/browser/zero_suggest_provider.cc
@@ -73,8 +73,9 @@
 // static
 ZeroSuggestProvider* ZeroSuggestProvider::Create(
     AutocompleteProviderClient* client,
+    HistoryURLProvider* history_url_provider,
     AutocompleteProviderListener* listener) {
-  return new ZeroSuggestProvider(client, listener);
+  return new ZeroSuggestProvider(client, history_url_provider, listener);
 }
 
 // static
@@ -184,9 +185,12 @@
   set_field_trial_triggered(false);
 }
 
-ZeroSuggestProvider::ZeroSuggestProvider(AutocompleteProviderClient* client,
-                                         AutocompleteProviderListener* listener)
+ZeroSuggestProvider::ZeroSuggestProvider(
+    AutocompleteProviderClient* client,
+    HistoryURLProvider* history_url_provider,
+    AutocompleteProviderListener* listener)
     : BaseSearchProvider(AutocompleteProvider::TYPE_ZERO_SUGGEST, client),
+      history_url_provider_(history_url_provider),
       listener_(listener),
       results_from_cache_(false),
       waiting_for_most_visited_urls_request_(false),
@@ -416,8 +420,10 @@
   // The placeholder suggestion for the current URL has high relevance so
   // that it is in the first suggestion slot and inline autocompleted. It
   // gets dropped as soon as the user types something.
-  return VerbatimMatchForURL(client(), permanent_text_,
-                             current_page_classification_,
+  AutocompleteInput tmp(GetInput(false));
+  tmp.UpdateText(permanent_text_, base::string16::npos, tmp.parts());
+  return VerbatimMatchForURL(client(), tmp, GURL(current_query_),
+                             history_url_provider_,
                              results_.verbatim_relevance);
 }