components/omnibox/browser/autocomplete_result_unittest.cc - Issue 2266083002: Avoid DCHECK failure for chrome:// URLs in autocomplete suggestions

Unified Diff: components/omnibox/browser/autocomplete_result_unittest.cc

Issue 2266083002: Avoid DCHECK failure for chrome:// URLs in autocomplete suggestions (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: changes for pkasting@ Created 4 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: components/omnibox/browser/autocomplete_result_unittest.cc

diff --git a/components/omnibox/browser/autocomplete_result_unittest.cc b/components/omnibox/browser/autocomplete_result_unittest.cc

index 224e1faa621519527dd32a5bb5fa34bdc2c4e812..0d2c2b1a3827d56eccc85606add3ea83ccd28f72 100644

--- a/components/omnibox/browser/autocomplete_result_unittest.cc

+++ b/components/omnibox/browser/autocomplete_result_unittest.cc

@@ -374,9 +374,10 @@ TEST_F(AutocompleteResultTest, SortAndCullEmptyDestinationURLs) {

matches[3].destination_url = GURL();

matches[4].destination_url = GURL();

- AutocompleteInput input(base::string16(), base::string16::npos, std::string(),

- GURL(), OmniboxEventProto::INVALID_SPEC, false, false,

- false, true, false, TestSchemeClassifier());

+ AutocompleteInput input(base::ASCIIToUTF16("a"), base::string16::npos,

+ std::string(), GURL(),

+ OmniboxEventProto::INVALID_SPEC, false, false, false,

+ true, false, TestSchemeClassifier());

AutocompleteResult result;

result.AppendMatches(input, matches);

result.SortAndCull(input, template_url_service_.get());

@@ -419,9 +420,10 @@ TEST_F(AutocompleteResultTest, SortAndCullDuplicateSearchURLs) {

matches[3].destination_url = GURL("http://www.foo.com/s?q=foo&aqs=0");

matches[4].destination_url = GURL("http://www.foo.com/");

- AutocompleteInput input(base::string16(), base::string16::npos, std::string(),

- GURL(), OmniboxEventProto::INVALID_SPEC, false, false,

- false, true, false, TestSchemeClassifier());

+ AutocompleteInput input(base::ASCIIToUTF16("a"), base::string16::npos,

+ std::string(), GURL(),

+ OmniboxEventProto::INVALID_SPEC, false, false, false,

+ true, false, TestSchemeClassifier());

AutocompleteResult result;

result.AppendMatches(input, matches);

result.SortAndCull(input, template_url_service_.get());

@@ -470,9 +472,10 @@ TEST_F(AutocompleteResultTest, SortAndCullWithMatchDups) {

matches[4].destination_url = GURL("http://www.foo.com/");

matches[5].destination_url = GURL("http://www.foo.com/s?q=foo2&oq=f");

- AutocompleteInput input(base::string16(), base::string16::npos, std::string(),

- GURL(), OmniboxEventProto::INVALID_SPEC, false, false,

- false, true, false, TestSchemeClassifier());

+ AutocompleteInput input(base::ASCIIToUTF16("a"), base::string16::npos,

+ std::string(), GURL(),

+ OmniboxEventProto::INVALID_SPEC, false, false, false,

+ true, false, TestSchemeClassifier());

AutocompleteResult result;

result.AppendMatches(input, matches);

result.SortAndCull(input, template_url_service_.get());

@@ -523,9 +526,10 @@ TEST_F(AutocompleteResultTest, SortAndCullWithDemotionsByType) {

base::FieldTrialList::CreateFieldTrial(

OmniboxFieldTrial::kBundledExperimentFieldTrialName, "A");

- AutocompleteInput input(base::string16(), base::string16::npos, std::string(),

- GURL(), OmniboxEventProto::HOME_PAGE, false, false,

- false, true, false, TestSchemeClassifier());

+ AutocompleteInput input(base::ASCIIToUTF16("a"), base::string16::npos,

+ std::string(), GURL(), OmniboxEventProto::HOME_PAGE,

+ false, false, false, true, false,

+ TestSchemeClassifier());

AutocompleteResult result;

result.AppendMatches(input, matches);

result.SortAndCull(input, template_url_service_.get());

@@ -568,7 +572,7 @@ TEST_F(AutocompleteResultTest, SortAndCullWithMatchDupsAndDemotionsByType) {

{

AutocompleteInput input(

- base::string16(), base::string16::npos, std::string(), GURL(),

+ base::ASCIIToUTF16("a"), base::string16::npos, std::string(), GURL(),

OmniboxEventProto::INSTANT_NTP_WITH_FAKEBOX_AS_STARTING_FOCUS, false,

false, false, true, false, TestSchemeClassifier());

AutocompleteResult result;

@@ -598,6 +602,7 @@ TEST_F(AutocompleteResultTest, SortAndCullReorderForDefaultMatch) {

{ 2, 1, 1100, true },

{ 3, 1, 1000, true }

};

+ TestSchemeClassifier test_scheme_classifier;

{

// Check that reorder doesn't do anything if the top result

@@ -605,10 +610,10 @@ TEST_F(AutocompleteResultTest, SortAndCullReorderForDefaultMatch) {

// PopulateAutocompleteMatches()).

ACMatches matches;

PopulateAutocompleteMatches(data, arraysize(data), &matches);

- AutocompleteInput input(base::string16(), base::string16::npos,

+ AutocompleteInput input(base::ASCIIToUTF16("a"), base::string16::npos,

std::string(), GURL(), OmniboxEventProto::HOME_PAGE,

false, false, false, true, false,

- TestSchemeClassifier());

+ test_scheme_classifier);

AutocompleteResult result;

result.AppendMatches(input, matches);

result.SortAndCull(input, template_url_service_.get());

@@ -621,10 +626,10 @@ TEST_F(AutocompleteResultTest, SortAndCullReorderForDefaultMatch) {

PopulateAutocompleteMatches(data, arraysize(data), &matches);

matches[0].allowed_to_be_default_match = false;

matches[1].allowed_to_be_default_match = false;

- AutocompleteInput input(base::string16(), base::string16::npos,

+ AutocompleteInput input(base::ASCIIToUTF16("a"), base::string16::npos,

std::string(), GURL(), OmniboxEventProto::HOME_PAGE,

false, false, false, true, false,

- TestSchemeClassifier());

+ test_scheme_classifier);

AutocompleteResult result;

result.AppendMatches(input, matches);

result.SortAndCull(input, template_url_service_.get());

« no previous file with comments | « components/omnibox/browser/autocomplete_result.cc ('k') | components/omnibox/browser/clipboard_url_provider.cc » ('j') | no next file with comments »