Convert SizeStringInt from taking a wstring to a string16.

views/controls/label.cc

Index: views/controls/label.cc
diff --git a/views/controls/label.cc b/views/controls/label.cc
index 32df88a7d5488f5ddbdc88df72e95551cfa6b467..b228c78b2bed6a28cb32551af0b73de2e5138a8d 100644
--- a/views/controls/label.cc
+++ b/views/controls/label.cc
@@ -68,7 +68,8 @@ int Label::GetHeightForWidth(int w) {
 
   w = std::max(0, w - GetInsets().width());
   int h = font_.GetHeight();
-  gfx::CanvasSkia::SizeStringInt(text_, font_, &w, &h, ComputeMultiLineFlags());
+  gfx::CanvasSkia::SizeStringInt(WideToUTF16Hack(text_), font_, &w, &h,
+                                 ComputeMultiLineFlags());
   return h + GetInsets().height();
 }
 
@@ -294,7 +295,8 @@ gfx::Size Label::GetTextSize() const {
     int flags = ComputeMultiLineFlags();
     if (!is_multi_line_)
       flags |= gfx::Canvas::NO_ELLIPSIS;
-    gfx::CanvasSkia::SizeStringInt(text_, font_, &w, &h, flags);
+    gfx::CanvasSkia::SizeStringInt(WideToUTF16Hack(text_), font_, &w, &h,
+                                   flags);
     text_size_.SetSize(w, h);
     text_size_valid_ = true;
   }