| 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..cf16348d7c6051fa2795c832d41b5ac856770206 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::INVALID_SPEC, 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());
|
| @@ -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());
|
|
|