Index: chrome/browser/autocomplete/search_provider_unittest.cc |
diff --git a/chrome/browser/autocomplete/search_provider_unittest.cc b/chrome/browser/autocomplete/search_provider_unittest.cc |
index 2df75358e0613a64ae88f51cb9c36d5ac4a3ea26..8a20136ee8a17bb47c8e39904d86411a788f5efe 100644 |
--- a/chrome/browser/autocomplete/search_provider_unittest.cc |
+++ b/chrome/browser/autocomplete/search_provider_unittest.cc |
@@ -330,8 +330,9 @@ void SearchProviderTest::RunTest(TestData* cases, |
ACMatches matches; |
for (int i = 0; i < num_cases; ++i) { |
AutocompleteInput input(cases[i].input, base::string16::npos, std::string(), |
- GURL(), metrics::OmniboxEventProto::INVALID_SPEC, |
- false, prefer_keyword, true, true, false, |
+ GURL(), base::string16(), |
+ metrics::OmniboxEventProto::INVALID_SPEC, false, |
+ prefer_keyword, true, true, false, |
ChromeAutocompleteSchemeClassifier(&profile_)); |
provider_->Start(input, false); |
matches = provider_->matches(); |
@@ -374,11 +375,11 @@ void SearchProviderTest::QueryForInput(const base::string16& text, |
bool prevent_inline_autocomplete, |
bool prefer_keyword) { |
// Start a query. |
- AutocompleteInput input(text, base::string16::npos, std::string(), GURL(), |
- metrics::OmniboxEventProto::INVALID_SPEC, |
- prevent_inline_autocomplete, prefer_keyword, true, |
- true, false, |
- ChromeAutocompleteSchemeClassifier(&profile_)); |
+ AutocompleteInput input( |
+ text, base::string16::npos, std::string(), GURL(), base::string16(), |
+ metrics::OmniboxEventProto::INVALID_SPEC, prevent_inline_autocomplete, |
+ prefer_keyword, true, true, false, |
+ ChromeAutocompleteSchemeClassifier(&profile_)); |
provider_->Start(input, false); |
// RunUntilIdle so that the task scheduled by SearchProvider to create the |
@@ -1008,8 +1009,8 @@ TEST_F(SearchProviderTest, KeywordOrderingAndDescriptions) { |
nullptr, AutocompleteProvider::TYPE_SEARCH); |
controller.Start(AutocompleteInput( |
ASCIIToUTF16("k t"), base::string16::npos, std::string(), GURL(), |
- metrics::OmniboxEventProto::INVALID_SPEC, false, false, true, true, false, |
- ChromeAutocompleteSchemeClassifier(&profile_))); |
+ base::string16(), metrics::OmniboxEventProto::INVALID_SPEC, false, false, |
+ true, true, false, ChromeAutocompleteSchemeClassifier(&profile_))); |
const AutocompleteResult& result = controller.result(); |
// There should be three matches, one for the keyword history, one for |
@@ -3601,8 +3602,8 @@ TEST_F(SearchProviderTest, RemoveExtraAnswers) { |
TEST_F(SearchProviderTest, DoesNotProvideOnFocus) { |
AutocompleteInput input( |
base::ASCIIToUTF16("f"), base::string16::npos, std::string(), GURL(), |
- metrics::OmniboxEventProto::INVALID_SPEC, false, true, true, true, true, |
- ChromeAutocompleteSchemeClassifier(&profile_)); |
+ base::string16(), metrics::OmniboxEventProto::INVALID_SPEC, false, true, |
+ true, true, true, ChromeAutocompleteSchemeClassifier(&profile_)); |
provider_->Start(input, false); |
EXPECT_TRUE(provider_->matches().empty()); |
} |
@@ -3610,8 +3611,8 @@ TEST_F(SearchProviderTest, DoesNotProvideOnFocus) { |
TEST_F(SearchProviderTest, SendsWarmUpRequestOnFocus) { |
AutocompleteInput input( |
base::ASCIIToUTF16("f"), base::string16::npos, std::string(), GURL(), |
- metrics::OmniboxEventProto::INVALID_SPEC, false, true, true, true, true, |
- ChromeAutocompleteSchemeClassifier(&profile_)); |
+ base::string16(), metrics::OmniboxEventProto::INVALID_SPEC, false, true, |
+ true, true, true, ChromeAutocompleteSchemeClassifier(&profile_)); |
// First, verify that without the warm-up feature enabled, the provider |
// immediately terminates with no matches. |