Remove wstring from autocomplete.

chrome/browser/ui/views/location_bar/keyword_hint_view.cc

Index: chrome/browser/ui/views/location_bar/keyword_hint_view.cc
===================================================================
--- chrome/browser/ui/views/location_bar/keyword_hint_view.cc	(revision 72388)
+++ chrome/browser/ui/views/location_bar/keyword_hint_view.cc	(working copy)
@@ -48,7 +48,7 @@
   trailing_label_->SetColor(color);
 }
 
-void KeywordHintView::SetKeyword(const std::wstring& keyword) {
+void KeywordHintView::SetKeyword(const string16& keyword) {
   keyword_ = keyword;
   if (keyword_.empty())
     return;
@@ -59,7 +59,7 @@
   std::vector<size_t> content_param_offsets;
   bool is_extension_keyword;
   string16 short_name = profile_->GetTemplateURLModel()->
-      GetKeywordShortName(WideToUTF16Hack(keyword), &is_extension_keyword);
+      GetKeywordShortName(keyword, &is_extension_keyword);
   int message_id = is_extension_keyword ?
       IDS_OMNIBOX_EXTENSION_KEYWORD_HINT : IDS_OMNIBOX_KEYWORD_HINT;
   const std::wstring keyword_hint =
Property changes on: chrome/browser/ui/views/location_bar/keyword_hint_view.cc
___________________________________________________________________
Deleted: svn:mergeinfo