Revert 72380 - Remove wstring from autocomplete....

chrome/browser/autocomplete/search_provider_unittest.cc

Index: chrome/browser/autocomplete/search_provider_unittest.cc
===================================================================
--- chrome/browser/autocomplete/search_provider_unittest.cc	(revision 72382)
+++ 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(text, string16(), prevent_inline_autocomplete,
-                          false, true, false);
+  AutocompleteInput input(UTF16ToWide(text), std::wstring(),
+                          prevent_inline_autocomplete, false, true, false);
   provider_->Start(input, false);
 
   // RunAllPending so that the task scheduled by SearchProvider to create the
@@ -312,7 +312,8 @@
   EXPECT_TRUE(match.template_url);
 
   // The fill into edit should contain the keyword.
-  EXPECT_EQ(keyword_t_url_->keyword() + char16(' ') + keyword_term_,
+  EXPECT_EQ(UTF16ToWideHack(keyword_t_url_->keyword()) +
+                L" " + UTF16ToWide(keyword_term_),
             match.fill_into_edit);
 }
 
@@ -359,7 +360,7 @@
   EXPECT_FALSE(provider_->done());
 
   // Tell the provider instant is done.
-  provider_->FinalizeInstantQuery(ASCIIToUTF16("foo"), ASCIIToUTF16("bar"));
+  provider_->FinalizeInstantQuery(L"foo", L"bar");
 
   // The provider should now be done.
   EXPECT_TRUE(provider_->done());
@@ -396,7 +397,7 @@
   QueryForInput(ASCIIToUTF16("foo"), false);
 
   // Finalize the instant query immediately.
-  provider_->FinalizeInstantQuery(ASCIIToUTF16("foo"), ASCIIToUTF16("bar"));
+  provider_->FinalizeInstantQuery(L"foo", L"bar");
 
   // There should be two matches, one for what you typed, the other for
   // 'foobar'.