Omnibox - Do Not Allow HTTP/HTTPS Equivalence if User Explicitly Entered A Scheme

components/omnibox/autocomplete_match.h

Index: components/omnibox/autocomplete_match.h
diff --git a/components/omnibox/autocomplete_match.h b/components/omnibox/autocomplete_match.h
index 0464d73ac275e41a2c753bc5a6925828ddc70cbd..3727145c2e445e462c85c0dd9543f9fcaf8829e9 100644
--- a/components/omnibox/autocomplete_match.h
+++ b/components/omnibox/autocomplete_match.h
@@ -10,6 +10,7 @@
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
+#include "components/omnibox/autocomplete_input.h"
 #include "components/omnibox/autocomplete_match_type.h"
 #include "components/search_engines/template_url.h"
 #include "ui/base/page_transition_types.h"
@@ -183,22 +184,27 @@ struct AutocompleteMatch {
   // left empty and the template URL (if any) is determined from the
   // destination's hostname.  The template URL is used to strip off query args
   // other than the search terms themselves that would otherwise prevent doing
-  // proper deduping.
+  // proper deduping.  |input| is used to decide if the scheme is allowed to
+  // be altered during stripping.  (If one of the words in the input looks like
+  // a http/https scheme plus the beginning of this URL's hostname, we prevent
+  // two URLs with different schemes from having the same stripped GURL.)

[Peter Kasting, 2015/06/09 20:36:39]

Nit: How about:

"...altered during stripping.  If this URL, minus the scheme and separator,
starts with any the terms in input.http_following_terms(), we avoid converting
an HTTPS scheme to HTTP.  This means that URLs that differ only by these schemes
won't be marked as dupes, since the distinction seems to matter to the user."

[Mark P, 2015/06/10 23:38:35]

That's much better, thanks.

   static GURL GURLToStrippedGURL(const GURL& url,
+                                 const AutocompleteInput& input,
                                  TemplateURLService* template_url_service,
                                  const base::string16& keyword);
 
   // Computes the stripped destination URL (via GURLToStrippedGURL()) and
   // stores the result in |stripped_destination_url|.
-  void ComputeStrippedDestinationURL(TemplateURLService* template_url_service);
+  void ComputeStrippedDestinationURL(
+      const AutocompleteInput& input,
+      TemplateURLService* template_url_service);
 
   // Sets |allowed_to_be_default_match| to true if this match is effectively
   // the URL-what-you-typed match (i.e., would be dupped against the UWYT
-  // match when AutocompleteResult merges matches).  |canonical_input_url| is
-  // the AutocompleteInput interpreted as a URL (i.e.,
-  // AutocompleteInput::canonicalized_url()).
-  void EnsureUWYTIsAllowedToBeDefault(const GURL& canonical_input_url,
-                                      TemplateURLService* template_url_service);
+  // match when AutocompleteResult merges matches).
+  void EnsureUWYTIsAllowedToBeDefault(
+      const AutocompleteInput& input,
+      TemplateURLService* template_url_service);
 
   // Gets data relevant to whether there should be any special keyword-related
   // UI shown for this match.  If this match represents a selected keyword, i.e.