Omnibox: Fix URL-What-You-Typed Allowed-To-Be-Default-Match Issues

chrome/browser/autocomplete/autocomplete_match.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 "chrome/browser/autocomplete/autocomplete_match.h"
 
 #include "base/i18n/time_formatting.h"
 #include "base/logging.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 327 matching lines @@
 
 // static
 bool AutocompleteMatch::IsSpecializedSearchType(Type type) {
   return type == AutocompleteMatchType::SEARCH_SUGGEST_ENTITY ||
          type == AutocompleteMatchType::SEARCH_SUGGEST_INFINITE ||
          type == AutocompleteMatchType::SEARCH_SUGGEST_PERSONALIZED ||
          type == AutocompleteMatchType::SEARCH_SUGGEST_PROFILE ||
          type == AutocompleteMatchType::SEARCH_SUGGEST_ANSWER;
 }
 
-void AutocompleteMatch::ComputeStrippedDestinationURL(Profile* profile) {
-  stripped_destination_url = destination_url;
-  if (!stripped_destination_url.is_valid())
-    return;
+// static
+GURL AutocompleteMatch::GURLToStrippedGURL(
+    const GURL& url, Profile* profile, const base::string16& keyword) {

[Peter Kasting, 2014/06/30 23:02:58]

Nit: One arg per line

[Mark P, 2014/06/30 23:27:36]

Done.

+  if (!url.is_valid())
+    return url;
+
+  GURL stripped_destination_url = url;
 
   // If the destination URL looks like it was generated from a TemplateURL,
   // remove all substitutions other than the search terms.  This allows us
   // to eliminate cases like past search URLs from history that differ only
   // by some obscure query param from each other or from the search/keyword
   // provider matches.
-  TemplateURL* template_url = GetTemplateURL(profile, true);
+  TemplateURL* template_url = GetTemplateURLWithKeyword(
+      profile, keyword, stripped_destination_url.host());
   UIThreadSearchTermsData search_terms_data(profile);
   if (template_url != NULL &&
       template_url->SupportsReplacement(search_terms_data)) {
     base::string16 search_terms;
     if (template_url->ExtractSearchTermsFromURL(stripped_destination_url,
                                                 search_terms_data,
                                                 &search_terms)) {
       stripped_destination_url =
           GURL(template_url->url_ref().ReplaceSearchTerms(
               TemplateURLRef::SearchTermsArgs(search_terms),
@@ skipping 21 matching lines @@
   // Replace https protocol with http protocol.
   if (stripped_destination_url.SchemeIs(url::kHttpsScheme)) {
     replacements.SetScheme(url::kHttpScheme,
                            url::Component(0, strlen(url::kHttpScheme)));
     needs_replacement = true;
   }
 
   if (needs_replacement)
     stripped_destination_url = stripped_destination_url.ReplaceComponents(
         replacements);
+  return stripped_destination_url;
+}
+
+void AutocompleteMatch::ComputeStrippedDestinationURL(Profile* profile) {
+  stripped_destination_url =
+      GURLToStrippedGURL(destination_url, profile, keyword);
 }
 
 void AutocompleteMatch::GetKeywordUIState(Profile* profile,
                                           base::string16* keyword,
                                           bool* is_keyword_hint) const {
   *is_keyword_hint = associated_keyword.get() != NULL;
   keyword->assign(*is_keyword_hint ? associated_keyword->keyword :
       GetSubstitutingExplicitlyInvokedKeyword(profile));
 }
 
 base::string16 AutocompleteMatch::GetSubstitutingExplicitlyInvokedKeyword(
     Profile* profile) const {
   if (transition != content::PAGE_TRANSITION_KEYWORD)
     return base::string16();
   const TemplateURL* t_url = GetTemplateURL(profile, false);
   return (t_url &&
           t_url->SupportsReplacement(UIThreadSearchTermsData(profile))) ?
       keyword : base::string16();
 }
 
 TemplateURL* AutocompleteMatch::GetTemplateURL(
     Profile* profile, bool allow_fallback_to_destination_host) const {
+  return GetTemplateURLWithKeyword(
+      profile, keyword,
+      allow_fallback_to_destination_host ? destination_url.host()

[Peter Kasting, 2014/06/30 23:02:58]

Nit: Break after '?' instead of before ':'

(aka I suggest not running clang-format on omnibox changes)

[Mark P, 2014/06/30 23:27:36]

Done.

+                                         : std::string());
+}
+
+// static
+TemplateURL* AutocompleteMatch::GetTemplateURLWithKeyword(
+    Profile* profile,
+    const base::string16& keyword,
+    const std::string& host) {
   DCHECK(profile);
   TemplateURLService* template_url_service =
       TemplateURLServiceFactory::GetForProfile(profile);
   if (template_url_service == NULL)
     return NULL;
   TemplateURL* template_url = keyword.empty() ? NULL :
       template_url_service->GetTemplateURLForKeyword(keyword);
-  if (template_url == NULL && allow_fallback_to_destination_host) {
-    template_url = template_url_service->GetTemplateURLForHost(
-        destination_url.host());
+  if (template_url == NULL && !host.empty()) {
+    template_url = template_url_service->GetTemplateURLForHost(host);
   }
   return template_url;
 }
 
 void AutocompleteMatch::RecordAdditionalInfo(const std::string& property,
                                              const std::string& value) {
   DCHECK(!property.empty());
   DCHECK(!value.empty());
   additional_info[property] = value;
 }
@@ skipping 69 matching lines @@
         << " is unsorted in relation to last offset of " << last_offset
         << ". Provider: " << provider_name << ".";
     DCHECK_LT(i->offset, text.length())
         << " Classification of [" << i->offset << "," << text.length()
         << "] is out of bounds for \"" << text << "\". Provider: "
         << provider_name << ".";
     last_offset = i->offset;
   }
 }
 #endif