Fix DCHECK.

components/omnibox/browser/omnibox_edit_unittest.cc

Index: components/omnibox/browser/omnibox_edit_unittest.cc
diff --git a/components/omnibox/browser/omnibox_edit_unittest.cc b/components/omnibox/browser/omnibox_edit_unittest.cc
index 9b1158c6736a0ee5e99527b70a24c0a10ac1c487..3d49b95778e467891f8cf0356475527bb9fcac90 100644
--- a/components/omnibox/browser/omnibox_edit_unittest.cc
+++ b/components/omnibox/browser/omnibox_edit_unittest.cc
@@ -140,6 +140,10 @@ class TestingOmniboxClient : public OmniboxClient {
   TestingOmniboxClient();
   ~TestingOmniboxClient() override;
 
+  const AutocompleteMatch& alternate_nav_match() const {
+    return alternate_nav_match_;
+  }
+
   // OmniboxClient:
   std::unique_ptr<AutocompleteProviderClient> CreateAutocompleteProviderClient()
       override;
@@ -148,6 +152,7 @@ class TestingOmniboxClient : public OmniboxClient {
       const base::string16& text,
       const AutocompleteMatch& match,
       const AutocompleteMatch& alternate_nav_match) override {
+    alternate_nav_match_ = alternate_nav_match;
     return nullptr;
   }
   bool CurrentPageExists() const override { return true; }
@@ -206,6 +211,8 @@ class TestingOmniboxClient : public OmniboxClient {
   TestingSchemeClassifier scheme_classifier_;
   AutocompleteClassifier autocomplete_classifier_;
 

[Peter Kasting, 2016/06/08 01:21:34]

Will remove this blank line before landing

[Mark P, 2016/06/08 20:35:57]

Remember me.

+  AutocompleteMatch alternate_nav_match_;
+
   DISALLOW_COPY_AND_ASSIGN(TestingOmniboxClient);
 };
 
@@ -371,3 +378,25 @@ TEST_F(OmniboxEditTest, InlineAutocompleteText) {
   EXPECT_EQ(base::ASCIIToUTF16("hello"), view().GetText());
   EXPECT_EQ(base::string16(), view().inline_autocomplete_text());
 }
+
+TEST_F(OmniboxEditTest, HasHTTP) {

[Mark P, 2016/06/08 20:35:57]

nit: AlternateNavHasHttp?
Otherwise this test, with lack of comments, and lack of the context I know from
reading the changelist description and the bug, is pretty obscure.

[Peter Kasting, 2016/06/08 20:52:24]

Honestly, I need to figure out better whether the param I'm changing can have
any visible effect; maybe I should just always set it to false.

[Peter Kasting, 2016/06/09 19:26:56]

Turns out I can indeed just set it to false.  Did that, updated this test, and
added more comments to make the purpose clear.

+  const TestingOmniboxClient* client =
+      static_cast<TestingOmniboxClient*>(model()->client());
+  const AutocompleteMatch match(
+      model()->autocomplete_controller()->history_url_provider(), 0, false,
+      AutocompleteMatchType::URL_WHAT_YOU_TYPED);

[Mark P, 2016/06/08 20:35:57]

For realism, can you please make this a search provider match for
query-what-you-typed?  After all, that's what the typical case is / the case
mentioned in the bug.

[Peter Kasting, 2016/06/08 20:52:24]

Good idea.

+  const GURL alternate_nav_url("http://ab%20cd/");
+
+  model()->OnSetFocus(false);  // Avoids DCHECK in OpenMatch().
+  model()->SetUserText(base::ASCIIToUTF16("http://ab cd"));
+  model()->OpenMatch(match, CURRENT_TAB, alternate_nav_url, base::string16(),
+                     0);
+  EXPECT_TRUE(AutocompleteInput::HasHTTPScheme(
+      client->alternate_nav_match().fill_into_edit));
+
+  model()->SetUserText(base::ASCIIToUTF16("ab cd"));
+  model()->OpenMatch(match, CURRENT_TAB, alternate_nav_url, base::string16(),
+                     0);
+  EXPECT_FALSE(AutocompleteInput::HasHTTPScheme(
+      client->alternate_nav_match().fill_into_edit));
+}