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

components/omnibox/autocomplete_result_unittest.cc

Index: components/omnibox/autocomplete_result_unittest.cc
diff --git a/components/omnibox/autocomplete_result_unittest.cc b/components/omnibox/autocomplete_result_unittest.cc
index 1da1a5aa867f08e43d580e069fb02ac13e3bd745..ec16b6d5e8194c6d315bae0741556c591dbc792d 100644
--- a/components/omnibox/autocomplete_result_unittest.cc
+++ b/components/omnibox/autocomplete_result_unittest.cc
@@ -16,6 +16,7 @@
 #include "components/omnibox/autocomplete_match.h"
 #include "components/omnibox/autocomplete_match_type.h"
 #include "components/omnibox/autocomplete_provider.h"
+#include "components/omnibox/mock_autocomplete_provider_client.h"
 #include "components/omnibox/omnibox_field_trial.h"
 #include "components/omnibox/test_scheme_classifier.h"
 #include "components/search_engines/template_url_service.h"
@@ -111,6 +112,7 @@ class AutocompleteResultTest : public testing::Test {
   void SetUp() override {
     template_url_service_.reset(new TemplateURLService(NULL, 0));
     template_url_service_->Load();
+    client_.reset(new MockAutocompleteProviderClient());
   }
 
   // Configures |match| from |data|.
@@ -141,6 +143,7 @@ class AutocompleteResultTest : public testing::Test {
 
  protected:
   scoped_ptr<TemplateURLService> template_url_service_;
+  scoped_ptr<MockAutocompleteProviderClient> client_;
 
  private:
   scoped_ptr<base::FieldTrialList> field_trial_list_;
@@ -203,13 +206,13 @@ void AutocompleteResultTest::RunCopyOldMatchesTest(
 
   ACMatches last_matches;
   PopulateAutocompleteMatches(last, last_size, &last_matches);
-  AutocompleteResult last_result;
+  AutocompleteResult last_result(client_.get());
   last_result.AppendMatches(input, last_matches);
   last_result.SortAndCull(input, template_url_service_.get());
 
   ACMatches current_matches;
   PopulateAutocompleteMatches(current, current_size, &current_matches);
-  AutocompleteResult current_result;
+  AutocompleteResult current_result(client_.get());
   current_result.AppendMatches(input, current_matches);
   current_result.SortAndCull(input, template_url_service_.get());
   current_result.CopyOldMatches(
@@ -220,8 +223,8 @@ void AutocompleteResultTest::RunCopyOldMatchesTest(
 
 // Assertion testing for AutocompleteResult::Swap.
 TEST_F(AutocompleteResultTest, Swap) {
-  AutocompleteResult r1;
-  AutocompleteResult r2;
+  AutocompleteResult r1(client_.get());
+  AutocompleteResult r2(client_.get());
 
   // Swap with empty shouldn't do anything interesting.
   r1.Swap(&r2);
@@ -374,7 +377,7 @@ TEST_F(AutocompleteResultTest, SortAndCullEmptyDestinationURLs) {
   AutocompleteInput input(base::string16(), base::string16::npos, std::string(),
                           GURL(), OmniboxEventProto::INVALID_SPEC, false, false,
                           false, true, false, TestSchemeClassifier());
-  AutocompleteResult result;
+  AutocompleteResult result(client_.get());
   result.AppendMatches(input, matches);
   result.SortAndCull(input, template_url_service_.get());
 
@@ -419,7 +422,7 @@ TEST_F(AutocompleteResultTest, SortAndCullDuplicateSearchURLs) {
   AutocompleteInput input(base::string16(), base::string16::npos, std::string(),
                           GURL(), OmniboxEventProto::INVALID_SPEC, false, false,
                           false, true, false, TestSchemeClassifier());
-  AutocompleteResult result;
+  AutocompleteResult result(client_.get());
   result.AppendMatches(input, matches);
   result.SortAndCull(input, template_url_service_.get());
 
@@ -470,7 +473,7 @@ TEST_F(AutocompleteResultTest, SortAndCullWithMatchDups) {
   AutocompleteInput input(base::string16(), base::string16::npos, std::string(),
                           GURL(), OmniboxEventProto::INVALID_SPEC, false, false,
                           false, true, false, TestSchemeClassifier());
-  AutocompleteResult result;
+  AutocompleteResult result(client_.get());
   result.AppendMatches(input, matches);
   result.SortAndCull(input, template_url_service_.get());
 
@@ -523,7 +526,7 @@ TEST_F(AutocompleteResultTest, SortAndCullWithDemotionsByType) {
   AutocompleteInput input(base::string16(), base::string16::npos, std::string(),
                           GURL(), OmniboxEventProto::HOME_PAGE, false, false,
                           false, true, false, TestSchemeClassifier());
-  AutocompleteResult result;
+  AutocompleteResult result(client_.get());
   result.AppendMatches(input, matches);
   result.SortAndCull(input, template_url_service_.get());
 
@@ -568,7 +571,7 @@ TEST_F(AutocompleteResultTest, SortAndCullWithMatchDupsAndDemotionsByType) {
         base::string16(), base::string16::npos, std::string(), GURL(),
         OmniboxEventProto::INSTANT_NTP_WITH_FAKEBOX_AS_STARTING_FOCUS, false,
         false, false, true, false, TestSchemeClassifier());
-    AutocompleteResult result;
+    AutocompleteResult result(client_.get());
     result.AppendMatches(input, matches);
     result.SortAndCull(input, template_url_service_.get());
 
@@ -606,7 +609,7 @@ TEST_F(AutocompleteResultTest, SortAndCullReorderForDefaultMatch) {
                             std::string(), GURL(), OmniboxEventProto::HOME_PAGE,
                             false, false, false, true, false,
                             TestSchemeClassifier());
-    AutocompleteResult result;
+    AutocompleteResult result(client_.get());
     result.AppendMatches(input, matches);
     result.SortAndCull(input, template_url_service_.get());
     AssertResultMatches(result, data, 4);
@@ -622,7 +625,7 @@ TEST_F(AutocompleteResultTest, SortAndCullReorderForDefaultMatch) {
                             std::string(), GURL(), OmniboxEventProto::HOME_PAGE,
                             false, false, false, true, false,
                             TestSchemeClassifier());
-    AutocompleteResult result;
+    AutocompleteResult result(client_.get());
     result.AppendMatches(input, matches);
     result.SortAndCull(input, template_url_service_.get());
     ASSERT_EQ(4U, result.size());
@@ -635,7 +638,7 @@ TEST_F(AutocompleteResultTest, SortAndCullReorderForDefaultMatch) {
 
 TEST_F(AutocompleteResultTest, TopMatchIsStandaloneVerbatimMatch) {
   ACMatches matches;
-  AutocompleteResult result;
+  AutocompleteResult result(client_.get());
   result.AppendMatches(AutocompleteInput(), matches);
 
   // Case 1: Result set is empty.