Index: chrome/browser/extensions/api/omnibox/omnibox_api_browsertest.cc |
diff --git a/chrome/browser/extensions/api/omnibox/omnibox_api_browsertest.cc b/chrome/browser/extensions/api/omnibox/omnibox_api_browsertest.cc |
index c32c60ea407aea623fa65b1c0bc3a783b3a56ea9..c904a0ba7437dac75ca9c724db7c351162096525 100644 |
--- a/chrome/browser/extensions/api/omnibox/omnibox_api_browsertest.cc |
+++ b/chrome/browser/extensions/api/omnibox/omnibox_api_browsertest.cc |
@@ -42,8 +42,8 @@ IN_PROC_BROWSER_TEST_F(OmniboxApiTest, DISABLED_Basic) { |
{ |
autocomplete_controller->Start(AutocompleteInput( |
ASCIIToUTF16("keywor"), base::string16::npos, std::string(), GURL(), |
- OmniboxEventProto::NTP, true, false, true, true, false, |
- ChromeAutocompleteSchemeClassifier(profile))); |
+ base::string16(), OmniboxEventProto::NTP, true, false, true, true, |
+ false, ChromeAutocompleteSchemeClassifier(profile))); |
WaitForAutocompleteDone(autocomplete_controller); |
EXPECT_TRUE(autocomplete_controller->done()); |
@@ -64,8 +64,8 @@ IN_PROC_BROWSER_TEST_F(OmniboxApiTest, DISABLED_Basic) { |
{ |
autocomplete_controller->Start(AutocompleteInput( |
ASCIIToUTF16("keyword suggestio"), base::string16::npos, std::string(), |
- GURL(), OmniboxEventProto::NTP, true, false, true, true, false, |
- ChromeAutocompleteSchemeClassifier(profile))); |
+ GURL(), base::string16(), OmniboxEventProto::NTP, true, false, true, |
+ true, false, ChromeAutocompleteSchemeClassifier(profile))); |
WaitForAutocompleteDone(autocomplete_controller); |
EXPECT_TRUE(autocomplete_controller->done()); |
@@ -175,8 +175,8 @@ IN_PROC_BROWSER_TEST_F(OmniboxApiTest, OnInputEntered) { |
autocomplete_controller->Start(AutocompleteInput( |
ASCIIToUTF16("keyword command"), base::string16::npos, std::string(), |
- GURL(), OmniboxEventProto::NTP, true, false, true, true, false, |
- ChromeAutocompleteSchemeClassifier(profile))); |
+ GURL(), base::string16(), OmniboxEventProto::NTP, true, false, true, true, |
+ false, ChromeAutocompleteSchemeClassifier(profile))); |
omnibox_view->model()->AcceptInput(WindowOpenDisposition::CURRENT_TAB, false); |
WaitForAutocompleteDone(autocomplete_controller); |
EXPECT_TRUE(autocomplete_controller->done()); |
@@ -190,8 +190,8 @@ IN_PROC_BROWSER_TEST_F(OmniboxApiTest, OnInputEntered) { |
autocomplete_controller->Start(AutocompleteInput( |
ASCIIToUTF16("keyword newtab"), base::string16::npos, std::string(), |
- GURL(), OmniboxEventProto::NTP, true, false, true, true, false, |
- ChromeAutocompleteSchemeClassifier(profile))); |
+ GURL(), base::string16(), OmniboxEventProto::NTP, true, false, true, true, |
+ false, ChromeAutocompleteSchemeClassifier(profile))); |
omnibox_view->model()->AcceptInput(WindowOpenDisposition::NEW_FOREGROUND_TAB, |
false); |
WaitForAutocompleteDone(autocomplete_controller); |
@@ -228,8 +228,8 @@ IN_PROC_BROWSER_TEST_F(OmniboxApiTest, DISABLED_IncognitoSplitMode) { |
{ |
autocomplete_controller->Start(AutocompleteInput( |
ASCIIToUTF16("keyword suggestio"), base::string16::npos, std::string(), |
- GURL(), OmniboxEventProto::NTP, true, false, true, true, false, |
- ChromeAutocompleteSchemeClassifier(profile))); |
+ GURL(), base::string16(), OmniboxEventProto::NTP, true, false, true, |
+ true, false, ChromeAutocompleteSchemeClassifier(profile))); |
WaitForAutocompleteDone(autocomplete_controller); |
EXPECT_TRUE(autocomplete_controller->done()); |
@@ -250,8 +250,8 @@ IN_PROC_BROWSER_TEST_F(OmniboxApiTest, DISABLED_IncognitoSplitMode) { |
ResultCatcher catcher; |
autocomplete_controller->Start(AutocompleteInput( |
ASCIIToUTF16("keyword command incognito"), base::string16::npos, |
- std::string(), GURL(), OmniboxEventProto::NTP, true, false, true, true, |
- false, ChromeAutocompleteSchemeClassifier(profile))); |
+ std::string(), GURL(), base::string16(), OmniboxEventProto::NTP, true, |
+ false, true, true, false, ChromeAutocompleteSchemeClassifier(profile))); |
location_bar->AcceptInput(); |
EXPECT_TRUE(catcher.GetNextResult()) << catcher.message(); |
} |