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

chrome/browser/autocomplete/history_url_provider_unittest.cc

Index: chrome/browser/autocomplete/history_url_provider_unittest.cc
diff --git a/chrome/browser/autocomplete/history_url_provider_unittest.cc b/chrome/browser/autocomplete/history_url_provider_unittest.cc
index d111f25bae8ba4349d553f1364bbc083104583d8..4b50cedfc52027de05202c8cc081a6da301e9cd6 100644
--- a/chrome/browser/autocomplete/history_url_provider_unittest.cc
+++ b/chrome/browser/autocomplete/history_url_provider_unittest.cc
@@ -8,6 +8,7 @@
 
 #include "base/message_loop/message_loop.h"
 #include "base/prefs/pref_service.h"
+#include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
@@ -317,8 +318,11 @@ void HistoryURLProviderTest::RunTest(
   if (sort_matches_) {
     TemplateURLService* service =
         TemplateURLServiceFactory::GetForProfile(profile_.get());
-    for (ACMatches::iterator i = matches_.begin(); i != matches_.end(); ++i)
-      i->ComputeStrippedDestinationURL(service);
+    std::vector<base::string16> words;
+    base::SplitString(input.text(), ' ', &words);
+    for (ACMatches::iterator i = matches_.begin(); i != matches_.end(); ++i) {

[Peter Kasting, 2015/06/06 01:31:23]

Nit: No {}

[Mark P, 2015/06/09 19:29:38]

Done.

+      i->ComputeStrippedDestinationURL(words, service);
+    }
     AutocompleteResult::DedupMatchesByDestination(
         input.current_page_classification(), false, &matches_);
     std::sort(matches_.begin(), matches_.end(),