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

components/omnibox/autocomplete_match.h

 // Copyright 2014 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.
 
 #ifndef COMPONENTS_OMNIBOX_AUTOCOMPLETE_MATCH_H_
 #define COMPONENTS_OMNIBOX_AUTOCOMPLETE_MATCH_H_
 
 #include <map>
 #include <string>
 #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"
 #include "url/gurl.h"
 
 class AutocompleteProvider;
 class SuggestionAnswer;
 class TemplateURL;
 class TemplateURLService;
 
@@ skipping 153 matching lines @@
 
   // Returns |url| altered by stripping off "www.", converting https protocol
   // to http, and stripping excess query parameters.  These conversions are
   // merely to allow comparisons to remove likely duplicates; these URLs are
   // not used as actual destination URLs.  If |template_url_service| is not
   // NULL, it is used to get a template URL corresponding to this match.  If
   // the match's keyword is known, it can be passed in.  Otherwise, it can be
   // 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 this URL, minus the scheme and separator,
+  // starts with any the terms in input.terms_prefixed_by_http_or_https(), we
+  // we avoid converting an HTTPS scheme to HTTP.  This means URLs that differ

[Peter Kasting, 2015/06/11 05:21:44]

Nit: "we we avoid"

[Mark P, 2015/06/11 22:11:42]

Done.

+  // only by these schemes won't be marked as dupes, since the distinction
+  // seems to matter to the user.
   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.
   // the UI should be "in keyword mode", |keyword| will be set to the keyword
   // and |is_keyword_hint| will be set to false.  If this match has a non-NULL
   // |associated_keyword|, i.e. we should show a "Press [tab] to search ___"
   // hint and allow the user to toggle into keyword mode, |keyword| will be set
   // to the associated keyword and |is_keyword_hint| will be set to true.  Note
   // that only one of these states can be in effect at once.  In all other
   // cases, |keyword| will be cleared, even when our member variable |keyword|
@@ skipping 173 matching lines @@
       const base::string16& text,
       const ACMatchClassifications& classifications) const;
 #endif
 };
 
 typedef AutocompleteMatch::ACMatchClassification ACMatchClassification;
 typedef std::vector<ACMatchClassification> ACMatchClassifications;
 typedef std::vector<AutocompleteMatch> ACMatches;
 
 #endif  // COMPONENTS_OMNIBOX_AUTOCOMPLETE_MATCH_H_