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

chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac_unittest.mm

Index: chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac_unittest.mm
diff --git a/chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac_unittest.mm b/chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac_unittest.mm
index 9a74bc66bbd8304f333fffc3dcab94c86910617b..fbecd76d86816fb9967dea45e5631a56c2c15ff9 100644
--- a/chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac_unittest.mm
+++ b/chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac_unittest.mm
@@ -11,6 +11,7 @@
 #import "chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/omnibox/autocomplete_input.h"
+#include "components/omnibox/mock_autocomplete_provider_client.h"
 #include "ui/gfx/font_list.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/text_elider.h"
@@ -22,7 +23,9 @@ class MockOmniboxPopupViewMac : public OmniboxPopupViewMac {
   MockOmniboxPopupViewMac(OmniboxView* omnibox_view,
                           OmniboxEditModel* edit_model,
                           NSTextField* field)
-      : OmniboxPopupViewMac(omnibox_view, edit_model, field) {
+      : OmniboxPopupViewMac(omnibox_view, edit_model, field),
+        client_(new MockAutocompleteProviderClient()),
+        result_(client_.get()) {
   }
 
   void SetResultCount(size_t count) {
@@ -37,6 +40,7 @@ class MockOmniboxPopupViewMac : public OmniboxPopupViewMac {
   const AutocompleteResult& GetResult() const override { return result_; }
 
  private:
+  scoped_ptr<AutocompleteProviderClient> client_;

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

Nit: Again, can this drop the scoped_ptr?

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

Now moot.

   AutocompleteResult result_;
 };