Convert SizeStringInt from taking a wstring to a string16.

gfx/platform_font_win.cc

Index: gfx/platform_font_win.cc
diff --git a/gfx/platform_font_win.cc b/gfx/platform_font_win.cc
index 41caddeff9a59a0be9e167047941c7304e9eed77..05db587336fc14a7a1a8e5573f71f5ec3b0469d3 100644
--- a/gfx/platform_font_win.cc
+++ b/gfx/platform_font_win.cc
@@ -11,6 +11,7 @@
 
 #include "base/logging.h"
 #include "base/string_util.h"
+#include "base/utf_string_conversions.h"
 #include "base/win_util.h"
 #include "gfx/canvas_skia.h"
 #include "gfx/font.h"
@@ -103,7 +104,8 @@ int PlatformFontWin::GetAverageCharacterWidth() const {
 
 int PlatformFontWin::GetStringWidth(const std::wstring& text) const {
   int width = 0, height = 0;
-  CanvasSkia::SizeStringInt(text, Font(const_cast<PlatformFontWin*>(this)),
+  CanvasSkia::SizeStringInt(WideToUTF16Hack(text),
+                            Font(const_cast<PlatformFontWin*>(this)),
                             &width, &height, gfx::Canvas::NO_ELLIPSIS);
   return width;
 }