Convert SizeStringInt from taking a wstring to a string16.

views/controls/button/text_button.cc

Index: views/controls/button/text_button.cc
diff --git a/views/controls/button/text_button.cc b/views/controls/button/text_button.cc
index f758910b9dce71efb04f5aa16d48c9d312c547be..c0208bc9901c0f5b0f4cf747beca1407c24d620a 100644
--- a/views/controls/button/text_button.cc
+++ b/views/controls/button/text_button.cc
@@ -8,6 +8,7 @@
 
 #include "app/throb_animation.h"
 #include "app/resource_bundle.h"
+#include "base/utf_string_conversions.h"
 #include "gfx/canvas_skia.h"
 #include "views/controls/button/button.h"
 #include "views/event.h"
@@ -401,7 +402,7 @@ void TextButton::UpdateColor() {
 void TextButton::UpdateTextSize() {
   int width = 0, height = 0;
   gfx::CanvasSkia::SizeStringInt(
-      text_, font_, &width, &height,
+      WideToUTF16Hack(text_), font_, &width, &height,
       gfx::Canvas::NO_ELLIPSIS | PrefixTypeToCanvasType(prefix_type_));
 
   // Add 2 extra pixels to width and height when text halo is used.