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

chrome/browser/ui/omnibox/location_bar_util.cc

Index: chrome/browser/ui/omnibox/location_bar_util.cc
===================================================================
--- chrome/browser/ui/omnibox/location_bar_util.cc	(revision 71499)
+++ chrome/browser/ui/omnibox/location_bar_util.cc	(working copy)
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
 
@@ -18,10 +18,9 @@
 // TODO(sky): Once LocationBarView adds a listener to the TemplateURLModel
 // to track changes to the model, this should become a DCHECK.
   const TemplateURL* template_url =
-      profile->GetTemplateURLModel()->GetTemplateURLForKeyword(
-          WideToUTF16Hack(keyword));
+      profile->GetTemplateURLModel()->GetTemplateURLForKeyword(keyword);
   if (template_url)
-    return UTF16ToWideHack(template_url->AdjustedShortNameForLocaleDirection());
+    return template_url->AdjustedShortNameForLocaleDirection();
   return std::wstring();
 }