Revert 71485 - Remove wstring from TemplateURL and friends....

chrome/browser/autocomplete/search_provider.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 "chrome/browser/autocomplete/search_provider.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "app/l10n_util.h"
@@ skipping 399 matching lines @@
   have_suggest_results_ = false;
 }
 
 URLFetcher* SearchProvider::CreateSuggestFetcher(int id,
                                                  const TemplateURL& provider,
                                                  const std::wstring& text) {
   const TemplateURLRef* const suggestions_url = provider.suggestions_url();
   DCHECK(suggestions_url->SupportsReplacement());
   URLFetcher* fetcher = URLFetcher::Create(id,
       GURL(suggestions_url->ReplaceSearchTerms(
-           provider, WideToUTF16Hack(text),
-           TemplateURLRef::NO_SUGGESTIONS_AVAILABLE, string16())),
+           provider, text, TemplateURLRef::NO_SUGGESTIONS_AVAILABLE,
+           std::wstring())),
       URLFetcher::GET, this);
   fetcher->set_request_context(profile_->GetRequestContext());
   fetcher->Start();
   return fetcher;
 }
 
 bool SearchProvider::ParseSuggestResults(Value* root_val,
                                          bool is_keyword,
                                          const std::wstring& input_text,
                                          SuggestResults* suggest_results) {
@@ skipping 339 matching lines @@
 
   // When the user forced a query, we need to make sure all the fill_into_edit
   // values preserve that property.  Otherwise, if the user starts editing a
   // suggestion, non-Search results will suddenly appear.
   size_t search_start = 0;
   if (input_.type() == AutocompleteInput::FORCED_QUERY) {
     match.fill_into_edit.assign(L"?");
     ++search_start;
   }
   if (is_keyword) {
-    match.fill_into_edit.append(UTF16ToWideHack(
-        providers_.keyword_provider().keyword() + char16(' ')));
+    match.fill_into_edit.append(providers_.keyword_provider().keyword() + L" ");
     match.template_url = &providers_.keyword_provider();
   }
   match.fill_into_edit.append(query_string);
   // Not all suggestions start with the original input.
   if (!prevent_inline_autocomplete &&
       !match.fill_into_edit.compare(search_start, input_text.length(),
                                    input_text))
     match.inline_autocomplete_offset = search_start + input_text.length();
 
   const TemplateURLRef* const search_url = provider.url();
   DCHECK(search_url->SupportsReplacement());
   match.destination_url =
       GURL(search_url->ReplaceSearchTerms(provider,
-                                          WideToUTF16Hack(query_string),
+                                          query_string,
                                           accepted_suggestion,
-                                          WideToUTF16Hack(input_text)));
+                                          input_text));
 
   // Search results don't look like URLs.
   match.transition =
       is_keyword ? PageTransition::KEYWORD : PageTransition::GENERATED;
 
   // Try to add |match| to |map|.  If a match for |query_string| is already in
   // |map|, replace it if |match| is more relevant.
   // NOTE: Keep this ToLower() call in sync with url_database.cc.
   const std::pair<MatchMap::iterator, bool> i = map->insert(
       std::pair<std::wstring, AutocompleteMatch>(
@@ skipping 57 matching lines @@
 
   for (ACMatches::iterator i = matches_.begin(); i != matches_.end(); ++i) {
     AutocompleteMatch& match = *i;
     switch (match.type) {
       case AutocompleteMatch::SEARCH_WHAT_YOU_TYPED:
       case AutocompleteMatch::SEARCH_HISTORY:
       case AutocompleteMatch::SEARCH_SUGGEST:
         match.description.assign(
             UTF16ToWideHack(l10n_util::GetStringFUTF16(
                 IDS_AUTOCOMPLETE_SEARCH_DESCRIPTION,
-                providers_.default_provider().
-                    AdjustedShortNameForLocaleDirection())));
+                WideToUTF16Hack(providers_.default_provider().
+                                AdjustedShortNameForLocaleDirection()))));
         match.description_class.push_back(
             ACMatchClassification(0, ACMatchClassification::DIM));
         // Only the first search match gets a description.
         return;
 
       default:
         break;
     }
   }
 }