wstrings: make l10n_util::TruncateString use string16

chrome/browser/extensions/extension_menu_manager.cc

 // 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.
 
 #include "chrome/browser/extensions/extension_menu_manager.h"
 
 #include <algorithm>
 
 #include "app/l10n_util.h"
 #include "base/logging.h"
@@ skipping 55 matching lines @@
   return result;
 }
 
 string16 ExtensionMenuItem::TitleWithReplacement(
     const string16& selection, size_t max_length) const {
   string16 result = UTF8ToUTF16(title_);
   // TODO(asargent) - Change this to properly handle %% escaping so you can
   // put "%s" in titles that won't get substituted.
   ReplaceSubstringsAfterOffset(&result, 0, ASCIIToUTF16("%s"), selection);
 
-  if (result.length() > max_length) {
-    result = WideToUTF16(l10n_util::TruncateString(UTF16ToWideHack(result),
-                                                   max_length));
-  }
+  if (result.length() > max_length)
+    result = l10n_util::TruncateString(result, max_length);
   return result;
 }
 
 bool ExtensionMenuItem::SetChecked(bool checked) {
   if (type_ != CHECKBOX && type_ != RADIO)
     return false;
   checked_ = checked;
   return true;
 }
 
@@ skipping 407 matching lines @@
   if (profile < other.profile)
     return true;
   if (profile == other.profile) {
     if (extension_id < other.extension_id)
       return true;
     if (extension_id == other.extension_id)
       return uid < other.uid;
   }
   return false;
 }