wstring: remove wstring version of SplitString

views/controls/label.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 "views/controls/label.h"
 
 #include <cmath>
 #include <limits>
 
 #include "base/i18n/rtl.h"
@@ skipping 123 matching lines @@
   mouse_over_background_.reset(background);
 }
 
 const Background* Label::GetMouseOverBackground() const {
   return mouse_over_background_.get();
 }
 
 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();
 
   if (max_width > 0)
     label_width = std::min(label_width, max_width);
 
   SetBounds(x(), y(), label_width, 0);
   SizeToPreferredSize();
 }
@@ skipping 293 matching lines @@
         font_, GetAvailableRect().width(), true));
   } else {
     *paint_text = UTF16ToWideHack(text_);
   }
 
   *text_bounds = GetTextBounds();
   *flags = ComputeMultiLineFlags();
 }
 
 }  // namespace views