Fix DCHECK.

components/omnibox/browser/omnibox_edit_unittest.cc

 // 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.
 
 #include <stddef.h>
 
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 122 matching lines @@
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TestingSchemeClassifier);
 };
 
 class TestingOmniboxClient : public OmniboxClient {
  public:
   TestingOmniboxClient();
   ~TestingOmniboxClient() override;
 
+  const AutocompleteMatch& alternate_nav_match() const {
+    return alternate_nav_match_;
+  }
+
   // OmniboxClient:
   std::unique_ptr<AutocompleteProviderClient> CreateAutocompleteProviderClient()
       override;
 
   std::unique_ptr<OmniboxNavigationObserver> CreateOmniboxNavigationObserver(
       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; }
   const GURL& GetURL() const override { return GURL::EmptyGURL(); }
   const base::string16& GetTitle() const override {
     return base::EmptyString16();
   }
   gfx::Image GetFavicon() const override { return gfx::Image(); }
   bool IsInstantNTP() const override { return false; }
   bool IsSearchResultsPage() const override { return false; }
@@ skipping 37 matching lines @@
   void OnInputAccepted(const AutocompleteMatch& match) override {}
   void OnRevert() override {}
   void OnURLOpenedFromOmnibox(OmniboxLog* log) override {}
   void OnBookmarkLaunched() override {}
   void DiscardNonCommittedNavigations() override {}
 
  private:
   SessionID session_id_;
   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);
 };
 
 TestingOmniboxClient::TestingOmniboxClient()
     : autocomplete_classifier_(
           base::WrapUnique(new AutocompleteController(
               CreateAutocompleteProviderClient(),
               nullptr,
               AutocompleteClassifier::kDefaultOmniboxProviders)),
           base::WrapUnique(new TestingSchemeClassifier())) {}
@@ skipping 145 matching lines @@
   model()->SetUserText(base::ASCIIToUTF16("he"));
   model()->OnPopupDataChanged(base::ASCIIToUTF16("llo"), nullptr,
                               base::string16(), false);
   EXPECT_EQ(base::ASCIIToUTF16("hello"), view().GetText());
   EXPECT_EQ(base::ASCIIToUTF16("llo"), view().inline_autocomplete_text());
 
   model()->AcceptTemporaryTextAsUserText();
   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));
+}