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

chrome/browser/autocomplete/autocomplete_provider_unittest.cc

Index: chrome/browser/autocomplete/autocomplete_provider_unittest.cc
diff --git a/chrome/browser/autocomplete/autocomplete_provider_unittest.cc b/chrome/browser/autocomplete/autocomplete_provider_unittest.cc
index b0c4412b2f0e07cbd6b4a1b1e975a1efc0da0db8..679c85b5dbe723458090989393da49190f75d33f 100644
--- a/chrome/browser/autocomplete/autocomplete_provider_unittest.cc
+++ b/chrome/browser/autocomplete/autocomplete_provider_unittest.cc
@@ -26,6 +26,7 @@
 #include "components/omnibox/autocomplete_match.h"
 #include "components/omnibox/autocomplete_provider_listener.h"
 #include "components/omnibox/keyword_provider.h"
+#include "components/omnibox/mock_autocomplete_provider_client.h"
 #include "components/omnibox/search_provider.h"
 #include "components/search_engines/search_engines_switches.h"
 #include "components/search_engines/template_url.h"
@@ -176,6 +177,10 @@ class AutocompleteProviderTest : public testing::Test,
   };
 
  protected:
+  AutocompleteProviderTest():
+      client_(new MockAutocompleteProviderClient()),
+      result_(client_.get()) { }
+
    // Registers a test TemplateURL under the given keyword.
   void RegisterTemplateURL(const base::string16 keyword,
                            const std::string& template_url);
@@ -226,6 +231,7 @@ class AutocompleteProviderTest : public testing::Test,
     controller_->input_.current_page_classification_ = classification;
   }
 
+  scoped_ptr<AutocompleteProviderClient> client_;

[Peter Kasting, 2015/06/29 05:04:58]

Nit: Does this need to be a scoped_ptr?  Can it just be a straight
MockAutocompleteProviderClient?

(However, see comments in omnibox_edit_model.cc that may moot this)

[Mark P, 2015/06/30 04:23:16]

Now moot.

   AutocompleteResult result_;
 
  private:
@@ -414,7 +420,7 @@ void AutocompleteProviderTest::RunKeywordTest(const base::string16& input,
       metrics::OmniboxEventProto::INSTANT_NTP_WITH_OMNIBOX_AS_STARTING_FOCUS,
       false, true, true, true, false,
       ChromeAutocompleteSchemeClassifier(&profile_));
-  AutocompleteResult result;
+  AutocompleteResult result(client_.get());
   result.AppendMatches(controller_->input_, matches);
   controller_->UpdateAssociatedKeywords(&result);