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 324 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(
-    TemplateURLService* template_url_service) {
-  stripped_destination_url = destination_url;
-  if (!stripped_destination_url.is_valid())
-    return;
+// static
+TemplateURL* AutocompleteMatch::GetTemplateURLWithKeyword(
+    TemplateURLService* template_url_service,
+    const base::string16& keyword,
+    const std::string& host) {
+  if (template_url_service == NULL)
+    return NULL;
+  TemplateURL* template_url = keyword.empty() ? NULL :

[Peter Kasting, 2014/07/09 00:46:43]

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

[Mark P, 2014/07/09 19:54:17]

Done.

+      template_url_service->GetTemplateURLForKeyword(keyword);
+  if (template_url == NULL && !host.empty()) {

[Peter Kasting, 2014/07/09 00:46:43]

Nit: No {}

Simpler:

  return (template_url || host.empty()) ?
      template_url : template_url_service->GetTemplateURLForHost(host);

[Mark P, 2014/07/09 19:54:17]

Okay.  Done.

+    template_url = template_url_service->GetTemplateURLForHost(host);
+  }
+  return template_url;
+}
+
+// static
+GURL AutocompleteMatch::GURLToStrippedGURL(
+    const GURL& url,
+    TemplateURLService* template_url_service,
+    const base::string16& keyword) {
+  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(template_url_service, true);
+  TemplateURL* template_url = GetTemplateURLWithKeyword(
+      template_url_service, keyword, stripped_destination_url.host());
   if (template_url != NULL &&
       template_url->SupportsReplacement(
           template_url_service->search_terms_data())) {
     base::string16 search_terms;
     if (template_url->ExtractSearchTermsFromURL(
         stripped_destination_url,
         template_url_service->search_terms_data(),
         &search_terms)) {
       stripped_destination_url =
           GURL(template_url->url_ref().ReplaceSearchTerms(
@@ skipping 22 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(
+    TemplateURLService* template_url_service) {
+  stripped_destination_url =
+      GURLToStrippedGURL(destination_url, template_url_service, keyword);
+}
+
+void AutocompleteMatch::EnsureUWYTIsAllowedToBeDefault(
+    const GURL& canonical_input_url,
+    TemplateURLService* template_url_service) {
+  if (!allowed_to_be_default_match) {
+    const GURL& stripped_canonical_input_url =
+        AutocompleteMatch::GURLToStrippedGURL(
+            canonical_input_url, template_url_service, base::string16());
+    ComputeStrippedDestinationURL(template_url_service);
+    allowed_to_be_default_match =
+        stripped_canonical_input_url == stripped_destination_url;
+  }
 }
 
 void AutocompleteMatch::GetKeywordUIState(
     TemplateURLService* template_url_service,
     base::string16* keyword,
     bool* is_keyword_hint) const {
   *is_keyword_hint = associated_keyword.get() != NULL;
   keyword->assign(*is_keyword_hint ? associated_keyword->keyword :
       GetSubstitutingExplicitlyInvokedKeyword(template_url_service));
 }
 
 base::string16 AutocompleteMatch::GetSubstitutingExplicitlyInvokedKeyword(
     TemplateURLService* template_url_service) const {
   if (transition != content::PAGE_TRANSITION_KEYWORD ||
       template_url_service == NULL) {
     return base::string16();
   }
 
   const TemplateURL* t_url = GetTemplateURL(template_url_service, false);
   return (t_url &&
           t_url->SupportsReplacement(
               template_url_service->search_terms_data())) ?
       keyword : base::string16();
 }
 
 TemplateURL* AutocompleteMatch::GetTemplateURL(
     TemplateURLService* template_url_service,
     bool allow_fallback_to_destination_host) const {
-  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());
-  }
-  return template_url;
+  return GetTemplateURLWithKeyword(
+      template_url_service, keyword,
+      allow_fallback_to_destination_host ?
+          destination_url.host() : std::string());
 }
 
 void AutocompleteMatch::RecordAdditionalInfo(const std::string& property,
                                              const std::string& value) {
   DCHECK(!property.empty());
   DCHECK(!value.empty());
   additional_info[property] = value;
 }
 
 void AutocompleteMatch::RecordAdditionalInfo(const std::string& property,
@@ skipping 67 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