Revert 72380 - Remove wstring from autocomplete....

chrome/browser/autocomplete/search_provider_unittest.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/string_util.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "chrome/browser/autocomplete/autocomplete_match.h"
 #include "chrome/browser/autocomplete/search_provider.h"
@@ skipping 155 matching lines @@
 #if defined(OS_MACOSX)
   message_loop_.Run();
 #else
   message_loop_.Run(NULL);
 #endif
 }
 
 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
   // URLFetchers runs.
   message_loop_.RunAllPending();
 }
 
 void SearchProviderTest::TearDown() {
   message_loop_.RunAllPending();
 
@@ skipping 117 matching lines @@
 
   // The SearchProvider is done. Make sure it has a result for the history
   // term keyword.
   AutocompleteMatch match = FindMatchWithDestination(keyword_url_);
   ASSERT_TRUE(!match.destination_url.is_empty());
 
   // The match should have a TemplateURL.
   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);
 }
 
 TEST_F(SearchProviderTest, DontSendPrivateDataToSuggest) {
   // None of the following input strings should be sent to the suggest server,
   // because they may contain private data.
   const char* inputs[] = {
     "username:password",
     "http://username:password",
     "https://username:password",
@@ skipping 26 matching lines @@
 
   // Wait until history and the suggest query complete.
   profile_.BlockUntilHistoryProcessesPendingRequests();
   ASSERT_NO_FATAL_FAILURE(FinishDefaultSuggestQuery());
 
   // When instant is enabled the provider isn't done until it hears from
   // instant.
   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());
 
   // There should be two matches, one for what you typed, the other for
   // 'foobar'.
   EXPECT_EQ(2u, provider_->matches().size());
   GURL instant_url = GURL(default_t_url_->url()->ReplaceSearchTerms(
       *default_t_url_, ASCIIToUTF16("foobar"), 0, string16()));
   AutocompleteMatch instant_match = FindMatchWithDestination(instant_url);
@@ skipping 16 matching lines @@
 
 // Make sure that if FinalizeInstantQuery is invoked before suggest results
 // return, the suggest text from FinalizeInstantQuery is remembered.
 TEST_F(SearchProviderTest, RememberInstantQuery) {
   PrefService* service = profile_.GetPrefs();
   service->SetBoolean(prefs::kInstantEnabled, true);
 
   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'.
   EXPECT_EQ(2u, provider_->matches().size());
   GURL instant_url = GURL(default_t_url_->url()->ReplaceSearchTerms(
       *default_t_url_, ASCIIToUTF16("foobar"), 0, string16()));
   AutocompleteMatch instant_match = FindMatchWithDestination(instant_url);
   EXPECT_FALSE(instant_match.destination_url.is_empty());
 
   // Wait until history and the suggest query complete.
   profile_.BlockUntilHistoryProcessesPendingRequests();
   ASSERT_NO_FATAL_FAILURE(FinishDefaultSuggestQuery());
 
   // Provider should be done.
   EXPECT_TRUE(provider_->done());
 
   // There should be two matches, one for what you typed, the other for
   // 'foobar'.
   EXPECT_EQ(2u, provider_->matches().size());
   instant_match = FindMatchWithDestination(instant_url);
   EXPECT_FALSE(instant_match.destination_url.is_empty());
 
   // And the 'foobar' match should have a description.
   EXPECT_FALSE(instant_match.description.empty());
 }