Remove wstring from autocomplete.

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

Index: chrome/browser/ui/views/location_bar/selected_keyword_view.cc
===================================================================
--- chrome/browser/ui/views/location_bar/selected_keyword_view.cc	(revision 72388)
+++ chrome/browser/ui/views/location_bar/selected_keyword_view.cc	(working copy)
@@ -50,7 +50,7 @@
   IconLabelBubbleView::Layout();
 }
 
-void SelectedKeywordView::SetKeyword(const std::wstring& keyword) {
+void SelectedKeywordView::SetKeyword(const string16& keyword) {
   keyword_ = keyword;
   if (keyword.empty())
     return;
@@ -60,7 +60,7 @@
 
   bool is_extension_keyword;
   const 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_TEXT : IDS_OMNIBOX_KEYWORD_TEXT;
   full_label_.SetText(UTF16ToWide(
Property changes on: chrome/browser/ui/views/location_bar/selected_keyword_view.cc
___________________________________________________________________
Deleted: svn:mergeinfo