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

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

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h"
 #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"
 
 namespace {
 
 class MockOmniboxPopupViewMac : public OmniboxPopupViewMac {
  public:
   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) {
     ACMatches matches;
     for (size_t i = 0; i < count; ++i)
       matches.push_back(AutocompleteMatch());
     result_.Reset();
     result_.AppendMatches(AutocompleteInput(), matches);
   }
 
  protected:
   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_;
 };
 
 class OmniboxPopupViewMacTest : public CocoaProfileTest {
  public:
   OmniboxPopupViewMacTest() {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(OmniboxPopupViewMacTest);
 };
@@ skipping 21 matching lines @@
   EXPECT_GT(popup_view.GetTargetBounds().height(), old_height);
   EXPECT_EQ(5, [popup_view.matrix() numberOfRows]);
 
   popup_view.SetResultCount(0);
   popup_view.UpdatePopupAppearance();
   EXPECT_FALSE(popup_view.IsOpen());
   EXPECT_EQ(0, [popup_view.matrix() numberOfRows]);
 }
 
 }  // namespace