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

components/omnibox/autocomplete_result.cc

Index: components/omnibox/autocomplete_result.cc
diff --git a/components/omnibox/autocomplete_result.cc b/components/omnibox/autocomplete_result.cc
index a7299462e9806933f4b742e5c32115f2105829af..4b45a684b11034dc1bd3a8c6f2abdc0cb52871e4 100644
--- a/components/omnibox/autocomplete_result.cc
+++ b/components/omnibox/autocomplete_result.cc
@@ -121,6 +121,7 @@ AutocompleteResult::~AutocompleteResult() {}
 
 void AutocompleteResult::CopyOldMatches(
     const AutocompleteInput& input,
+    const std::string& languages,
     const AutocompleteResult& old_matches,
     TemplateURLService* template_url_service) {
   if (old_matches.empty())
@@ -158,7 +159,7 @@ void AutocompleteResult::CopyOldMatches(
                            i->second, matches_per_provider[i->first]);
   }
 
-  SortAndCull(input, template_url_service);
+  SortAndCull(input, languages, template_url_service);
 }
 
 void AutocompleteResult::AppendMatches(const AutocompleteInput& input,
@@ -178,9 +179,11 @@ void AutocompleteResult::AppendMatches(const AutocompleteInput& input,
 
 void AutocompleteResult::SortAndCull(
     const AutocompleteInput& input,
+    const std::string& languages,
     TemplateURLService* template_url_service) {
-  for (ACMatches::iterator i(matches_.begin()); i != matches_.end(); ++i)
-    i->ComputeStrippedDestinationURL(template_url_service);
+  for (ACMatches::iterator i(matches_.begin()); i != matches_.end(); ++i) {

[Peter Kasting, 2015/06/30 06:50:30]

Nit: No {}

[Mark P, 2015/06/30 17:29:21]

Done.

+    i->ComputeStrippedDestinationURL(input, languages, template_url_service);
+  }
 
   DedupMatchesByDestination(input.current_page_classification(), true,
                             &matches_);