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

chrome/browser/autocomplete/search_provider_unittest.cc

Index: chrome/browser/autocomplete/search_provider_unittest.cc
diff --git a/chrome/browser/autocomplete/search_provider_unittest.cc b/chrome/browser/autocomplete/search_provider_unittest.cc
index 24e47845eef83b9d765c011a5190f746945cbbef..bec5b31830865b056125701372557b85138d0176 100644
--- a/chrome/browser/autocomplete/search_provider_unittest.cc
+++ b/chrome/browser/autocomplete/search_provider_unittest.cc
@@ -2495,6 +2495,18 @@ TEST_F(SearchProviderTest, DefaultProviderSuggestRelevanceScoringUrlInput) {
       { { "a.com", AutocompleteMatchType::SEARCH_WHAT_YOU_TYPED, true  },
         { "info",  AutocompleteMatchType::SEARCH_SUGGEST,        false },
         kEmptyMatch, kEmptyMatch } },
+
+    // Ensure that if the user explicitly enters a scheme, a navsuggest
+    // result for a URL with a different scheme is not inlineable.
+    { "http://a.com", "[\"http://a.com\","
+               "[\"http://a.com/1\", \"https://a.com/\"],[],[],"
+                "{\"google:suggesttype\":[\"NAVIGATION\", \"NAVIGATION\"],"
+                 "\"google:suggestrelevance\":[9000, 8000]}]",
+      { { "http://a.com/1", AutocompleteMatchType::NAVSUGGEST,   true  },
+        { "https://a.com", AutocompleteMatchType::NAVSUGGEST,    false },
+        { "http://a.com",   AutocompleteMatchType::SEARCH_WHAT_YOU_TYPED,
+                                                                 true  },
+        kEmptyMatch } },
   };
 
   for (size_t i = 0; i < arraysize(cases); ++i) {
@@ -3516,7 +3528,7 @@ TEST_F(SearchProviderTest, SessionToken) {
 }
 
 TEST_F(SearchProviderTest, AnswersCache) {
-  AutocompleteResult result;
+  AutocompleteResult result(client_.get());
   ACMatches matches;
   AutocompleteMatch match1;
   match1.answer_contents = base::ASCIIToUTF16("m1");