Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(174)

Unified Diff: chrome/browser/autocomplete/search_provider_unittest.cc

Issue 6306011: Remove wstring from autocomplete. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 11 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: chrome/browser/autocomplete/search_provider_unittest.cc
===================================================================
--- chrome/browser/autocomplete/search_provider_unittest.cc (revision 72388)
+++ chrome/browser/autocomplete/search_provider_unittest.cc (working copy)
@@ -173,8 +173,8 @@
void SearchProviderTest::QueryForInput(const string16& text,
bool prevent_inline_autocomplete) {
// Start a query.
- AutocompleteInput input(UTF16ToWide(text), std::wstring(),
- prevent_inline_autocomplete, false, true, false);
+ AutocompleteInput input(text, string16(), prevent_inline_autocomplete,
+ false, true, false);
provider_->Start(input, false);
// RunAllPending so that the task scheduled by SearchProvider to create the
@@ -312,8 +312,7 @@
EXPECT_TRUE(match.template_url);
// The fill into edit should contain the keyword.
- EXPECT_EQ(UTF16ToWideHack(keyword_t_url_->keyword()) +
- L" " + UTF16ToWide(keyword_term_),
+ EXPECT_EQ(keyword_t_url_->keyword() + char16(' ') + keyword_term_,
match.fill_into_edit);
}
@@ -360,7 +359,7 @@
EXPECT_FALSE(provider_->done());
// Tell the provider instant is done.
- provider_->FinalizeInstantQuery(L"foo", L"bar");
+ provider_->FinalizeInstantQuery(ASCIIToUTF16("foo"), ASCIIToUTF16("bar"));
// The provider should now be done.
EXPECT_TRUE(provider_->done());
@@ -397,7 +396,7 @@
QueryForInput(ASCIIToUTF16("foo"), false);
// Finalize the instant query immediately.
- provider_->FinalizeInstantQuery(L"foo", L"bar");
+ provider_->FinalizeInstantQuery(ASCIIToUTF16("foo"), ASCIIToUTF16("bar"));
// There should be two matches, one for what you typed, the other for
// 'foobar'.

Powered by Google App Engine
This is Rietveld 408576698