Add title to current page in zero suggest.

components/omnibox/browser/zero_suggest_provider.cc

 // Copyright (c) 2012 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 "components/omnibox/browser/zero_suggest_provider.h"
 
 #include <stddef.h>
 
 #include "base/callback.h"
+#include "base/feature_list.h"
 #include "base/i18n/case_conversion.h"
 #include "base/json/json_string_value_serializer.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/metrics/user_metrics.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "base/trace_event/trace_event.h"
 #include "components/data_use_measurement/core/data_use_user_data.h"
@@ skipping 87 matching lines @@
   if (!input.from_omnibox_focus() ||
       input.type() == metrics::OmniboxInputType::INVALID)
     return;
 
   Stop(true, false);
   set_field_trial_triggered(false);
   set_field_trial_triggered_in_session(false);
   results_from_cache_ = false;
   permanent_text_ = input.text();
   current_query_ = input.current_url().spec();
+  current_title_ = input.current_title();
   current_page_classification_ = input.current_page_classification();
   current_url_match_ = MatchForCurrentURL();
-
   std::string url_string = GetContextualSuggestionsUrl();
   GURL suggest_url(url_string);
   if (!suggest_url.is_valid())
     return;
 
   // No need to send the current page URL in personalized suggest or
   // most visited field trials.
   const TemplateURLService* template_url_service =
       client()->GetTemplateURLService();
   const TemplateURL* default_provider =
@@ skipping 125 matching lines @@
 
 const TemplateURL* ZeroSuggestProvider::GetTemplateURL(bool is_keyword) const {
   // Zero suggest provider should not receive keyword results.
   DCHECK(!is_keyword);
   return client()->GetTemplateURLService()->GetDefaultSearchProvider();
 }
 
 const AutocompleteInput ZeroSuggestProvider::GetInput(bool is_keyword) const {
   // The callers of this method won't look at the AutocompleteInput's
   // |from_omnibox_focus| member, so we can set its value to false.
-  return AutocompleteInput(base::string16(), base::string16::npos,
-                           std::string(), GURL(current_query_),
-                           current_page_classification_, true, false, false,
-                           true, false, client()->GetSchemeClassifier());
+  return AutocompleteInput(
+      base::string16(), base::string16::npos, std::string(),
+      GURL(current_query_), base::string16(), current_page_classification_,
+      true, false, false, true, false, client()->GetSchemeClassifier());
 }
 
 bool ZeroSuggestProvider::ShouldAppendExtraParams(
       const SearchSuggestionParser::SuggestResult& result) const {
   // We always use the default provider for search, so append the params.
   return true;
 }
 
 void ZeroSuggestProvider::RecordDeletionResult(bool success) {
   if (success) {
@@ skipping 195 matching lines @@
     matches_.push_back(NavigationToMatch(*it));
   }
 }
 
 AutocompleteMatch ZeroSuggestProvider::MatchForCurrentURL() {
   // 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.
   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);
+  auto match =
+      VerbatimMatchForURL(client(), tmp, GURL(current_query_),

[Mark P, 2017/04/10 22:38:02]

Instead of this, please pass the title all the way into MatchForCurrentURL() and
from there into SuggestExactInput(). Don't revise it after the fact.

This will fix the other cases where other on-focus providers construct a URL
(such as physical web provider and clipboard provider).

[gcomanici, 2017/04/11 20:51:41]

Done.

+                          history_url_provider_, results_.verbatim_relevance);
+  if (base::FeatureList::IsEnabled(
+          omnibox::kIncludeTitleToACMatchForCurrentUrl)) {
+    match.description = current_title_;
+    AutocompleteMatch::ClassifyLocationInString(
+        base::string16::npos, 0, match.description.length(),
+        ACMatchClassification::NONE, &match.description_class);
+  }
+  return match;
 }
 
 bool ZeroSuggestProvider::ShouldShowNonContextualZeroSuggest(
     const GURL& suggest_url,
     const GURL& current_page_url) const {
   const TemplateURLService* template_url_service =
       client()->GetTemplateURLService();
   if (!ZeroSuggestEnabled(suggest_url,
                           template_url_service->GetDefaultSearchProvider(),
                           current_page_classification_,
@@ skipping 51 matching lines @@
   if (!json_data.empty()) {
     std::unique_ptr<base::Value> data(
         SearchSuggestionParser::DeserializeJsonData(json_data));
     if (data && ParseSuggestResults(
             *data, kDefaultZeroSuggestRelevance, false, &results_)) {
       ConvertResultsToAutocompleteMatches();
       results_from_cache_ = !matches_.empty();
     }
   }
 }