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: fix OmniboxViewViewsTest.CloseOmniboxPopupOnTextDrag 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

« components/omnibox/browser/autocomplete_result.cc ('K') | « components/omnibox/browser/autocomplete_result.cc ('k') | components/omnibox/browser/clipboard_url_provider.cc » ('j') | components/omnibox/browser/physical_web_provider.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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..91a5b419df30d43726031f211e901302a4fa0993 100644

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

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

@@ -374,8 +374,9 @@ 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,

+ 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);

@@ -419,8 +420,9 @@ 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,

+ 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);

@@ -470,8 +472,9 @@ 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,

+ 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);

@@ -523,8 +526,9 @@ 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,

+ 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);

@@ -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;

@@ -605,7 +609,7 @@ 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());

Peter Kasting 2016/09/01 22:06:35 Nit: Consider pulling this temp out to where |data

mattreynolds 2016/09/02 00:29:08 Done.

@@ -621,7 +625,7 @@ 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());