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

chrome/browser/ui/views/location_bar/selected_keyword_view.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/ui/views/location_bar/selected_keyword_view.h"
 
 #include "app/l10n_util.h"
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/search_engines/template_url_model.h"
@@ skipping 41 matching lines @@
 
 void SelectedKeywordView::SetKeyword(const std::wstring& keyword) {
   keyword_ = keyword;
   if (keyword.empty())
     return;
   DCHECK(profile_);
   if (!profile_->GetTemplateURLModel())
     return;
 
   bool is_extension_keyword;
-  const string16 short_name = profile_->GetTemplateURLModel()->
-      GetKeywordShortName(WideToUTF16Hack(keyword), &is_extension_keyword);
+  const string16 short_name = WideToUTF16(profile_->GetTemplateURLModel()->
+      GetKeywordShortName(keyword, &is_extension_keyword));
   int message_id = is_extension_keyword ?
       IDS_OMNIBOX_EXTENSION_KEYWORD_TEXT : IDS_OMNIBOX_KEYWORD_TEXT;
   full_label_.SetText(UTF16ToWide(
       l10n_util::GetStringFUTF16(message_id, short_name)));
   const std::wstring min_string(
       location_bar_util::CalculateMinString(UTF16ToWide(short_name)));
   partial_label_.SetText(min_string.empty() ?
       full_label_.GetText() :
       UTF16ToWide(l10n_util::GetStringFUTF16(message_id,
                                              WideToUTF16(min_string))));
 }