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"
 #include "components/omnibox/browser/autocomplete_classifier.h"
 #include "components/omnibox/browser/autocomplete_controller.h"
 #include "components/omnibox/browser/autocomplete_scheme_classifier.h"
-#include "components/omnibox/browser/history_url_provider.h"
 #include "components/omnibox/browser/mock_autocomplete_provider_client.h"
 #include "components/omnibox/browser/omnibox_client.h"
 #include "components/omnibox/browser/omnibox_edit_controller.h"
 #include "components/omnibox/browser/omnibox_edit_model.h"
 #include "components/omnibox/browser/omnibox_view.h"
+#include "components/omnibox/browser/search_provider.h"
 #include "components/search_engines/search_terms_data.h"
 #include "components/search_engines/template_url_service.h"
 #include "components/search_engines/template_url_service_client.h"
 #include "components/sessions/core/session_id.h"
 #include "components/toolbar/test_toolbar_model.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
 class TestingOmniboxView : public OmniboxView {
@@ skipping 103 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_;
+  AutocompleteMatch alternate_nav_match_;
 
   DISALLOW_COPY_AND_ASSIGN(TestingOmniboxClient);
 };
 
 TestingOmniboxClient::TestingOmniboxClient()
     : autocomplete_classifier_(
           base::WrapUnique(new AutocompleteController(
               CreateAutocompleteProviderClient(),
               nullptr,
               AutocompleteClassifier::kDefaultOmniboxProviders)),
@@ skipping 148 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());
 }
+
+// This verifies the fix for a bug where calling OpenMatch() with a valid
+// alternate nav URL would fail a DCHECK if the input began with "http://".
+// The failure was due to erroneously trying to strip the scheme from the
+// resulting fill_into_edit.  Alternate nav matches are never shown, so there's
+// no need to ever try and strip this scheme.
+TEST_F(OmniboxEditTest, AlternateNavHasHTTP) {
+  const TestingOmniboxClient* client =
+      static_cast<TestingOmniboxClient*>(model()->client());
+  const AutocompleteMatch match(
+      model()->autocomplete_controller()->search_provider(), 0, false,
+      AutocompleteMatchType::SEARCH_WHAT_YOU_TYPED);
+  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_TRUE(AutocompleteInput::HasHTTPScheme(
+      client->alternate_nav_match().fill_into_edit));
+}