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

chrome/browser/ui/views/location_bar/keyword_hint_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/keyword_hint_view.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
@@ skipping 40 matching lines @@
 void KeywordHintView::SetKeyword(const std::wstring& keyword) {
   keyword_ = keyword;
   if (keyword_.empty())
     return;
   DCHECK(profile_);
   if (!profile_->GetTemplateURLModel())
     return;
 
   std::vector<size_t> content_param_offsets;
   bool is_extension_keyword;
-  string16 short_name = profile_->GetTemplateURLModel()->
-      GetKeywordShortName(WideToUTF16Hack(keyword), &is_extension_keyword);
+  std::wstring short_name = profile_->GetTemplateURLModel()->
+      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 =
       UTF16ToWide(l10n_util::GetStringFUTF16(
           message_id,
           string16(),
-          short_name,
+          WideToUTF16(short_name),
           &content_param_offsets));
   if (content_param_offsets.size() == 2) {
     leading_label_->SetText(
         keyword_hint.substr(0, content_param_offsets.front()));
     trailing_label_->SetText(
         keyword_hint.substr(content_param_offsets.front()));
   } else {
     // See comments on an identical NOTREACHED() in search_provider.cc.
     NOTREACHED();
   }
@@ skipping 43 matching lines @@
 
   if (show_labels) {
     pref = leading_label_->GetPreferredSize();
     leading_label_->SetBounds(x, 0, pref.width(), height());
 
     x += pref.width() + kTabButtonBitmap->width();
     pref = trailing_label_->GetPreferredSize();
     trailing_label_->SetBounds(x, 0, pref.width(), height());
   }
 }