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

components/omnibox/shortcuts_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/shortcuts_provider.h"
 
 #include <algorithm>
 #include <cmath>
 #include <map>
 #include <vector>
@@ skipping 124 matching lines @@
   for (ShortcutsBackend::ShortcutMap::const_iterator it =
            FindFirstMatch(term_string, backend.get());
        it != backend->shortcuts_map().end() &&
            base::StartsWith(it->first, term_string, true);
        ++it) {
     // Don't return shortcuts with zero relevance.
     int relevance = CalculateScore(term_string, it->second, max_relevance);
     if (relevance) {
       matches_.push_back(ShortcutToACMatch(it->second, relevance, input,
                                            fixed_up_input));
-      matches_.back().ComputeStrippedDestinationURL(template_url_service);
+      matches_.back().ComputeStrippedDestinationURL(input,
+                                                    template_url_service);
     }
   }
-  // Remove duplicates.  Duplicates don't need to be preserved in the matches
-  // because they are only used for deletions, and shortcuts deletes matches
-  // based on the URL.
+  // Remove duplicates.  This is important because it's common to have multiple
+  // shortcuts pointing to the same URL, e.g., ma, mai, and mail all pointing
+  // to mail.google.com, so typing "m" will return them all.  If we then simply
+  // clamp to kMaxMatches and let the AutocompleteResult take care of
+  // collapsing the duplicates, we'll effectively only be returning one match,
+  // instead of several possibilities.
+  //
+  // Note that while removing duplicates, we don't populate a match's
+  // |duplicate_matches| field--duplicates don't need to be preserved in the
+  // matches because they are only used for deletions, and this provider
+  // deletes matches based on the URL.
   AutocompleteResult::DedupMatchesByDestination(
       input.current_page_classification(), false, &matches_);
   // Find best matches.
   std::partial_sort(matches_.begin(),
       matches_.begin() +
           std::min(AutocompleteProvider::kMaxMatches, matches_.size()),
       matches_.end(), &AutocompleteMatch::MoreRelevant);
   if (matches_.size() > AutocompleteProvider::kMaxMatches) {
     matches_.erase(matches_.begin() + AutocompleteProvider::kMaxMatches,
                    matches_.end());
@@ skipping 57 matching lines @@
         URLPrefix::GetInlineAutocompleteOffset(
             input.text(), fixed_up_input_text, true, match.fill_into_edit);
     if (inline_autocomplete_offset != base::string16::npos) {
       match.inline_autocompletion =
           match.fill_into_edit.substr(inline_autocomplete_offset);
       match.allowed_to_be_default_match =
           !HistoryProvider::PreventInlineAutocomplete(input) ||
           match.inline_autocompletion.empty();
     }
   }
-  match.EnsureUWYTIsAllowedToBeDefault(input.canonicalized_url(),
+  match.EnsureUWYTIsAllowedToBeDefault(input,
                                        client_->GetTemplateURLService());
 
   // Try to mark pieces of the contents and description as matches if they
   // appear in |input.text()|.
   const base::string16 term_string = base::i18n::ToLower(input.text());
   WordMap terms_map(CreateWordMapForString(term_string));
   if (!terms_map.empty()) {
     match.contents_class = ClassifyAllMatchesInString(term_string, terms_map,
         match.contents, match.contents_class);
     match.description_class = ClassifyAllMatchesInString(term_string, terms_map,
@@ skipping 152 matching lines @@
   // (1.0 / each 5 additional hits), up to a maximum of 5x as long.
   const double kMaxDecaySpeedDivisor = 5.0;
   const double kNumUsesPerDecaySpeedDivisorIncrement = 5.0;
   double decay_divisor = std::min(kMaxDecaySpeedDivisor,
       (shortcut.number_of_hits + kNumUsesPerDecaySpeedDivisorIncrement - 1) /
       kNumUsesPerDecaySpeedDivisorIncrement);
 
   return static_cast<int>((base_score / exp(decay_exponent / decay_divisor)) +
       0.5);
 }