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 0dc95ab17230975686fbe91b7ead6849fc8a2287..944ec6f31bc94e42b2396ad9ec4ee65f05f12322 100644
--- a/components/omnibox/autocomplete_result.cc
+++ b/components/omnibox/autocomplete_result.cc
@@ -123,6 +123,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())
@@ -160,7 +161,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,
@@ -187,9 +188,10 @@ 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);
+    i->ComputeStrippedDestinationURL(input, languages, template_url_service);
 
   DedupMatchesByDestination(input.current_page_classification(), true,
                             &matches_);