1 files changed, 4 insertions, 5 deletions
diff --git a/views/controls/label.cc b/views/controls/label.cc
index 80454c3..627dd98 100644
--- a/views/controls/label.cc
+++ b/views/controls/label.cc
@@ -141,14 +141,13 @@ const Background* Label::GetMouseOverBackground() const {
 void Label::SizeToFit(int max_width) {
   DCHECK(is_multi_line_);
 
-  std::vector<std::wstring> lines;
-  base::SplitString(UTF16ToWideHack(text_), L'\n', &lines);
+  std::vector<string16> lines;
+  base::SplitString(text_, '\n', &lines);
 
   int label_width = 0;
-  for (std::vector<std::wstring>::const_iterator iter = lines.begin();
+  for (std::vector<string16>::const_iterator iter = lines.begin();
        iter != lines.end(); ++iter) {
-    label_width = std::max(label_width,
-                           font_.GetStringWidth(WideToUTF16Hack(*iter)));
+    label_width = std::max(label_width, font_.GetStringWidth(*iter));
   }
 
   label_width += GetInsets().width();