Convert SizeStringInt from taking a wstring to a string16.

gfx/platform_font_gtk.cc

 // Copyright (c) 2010 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 "gfx/platform_font_gtk.h"
 
 #include <algorithm>
 #include <fontconfig/fontconfig.h>
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
@@ skipping 203 matching lines @@
 int PlatformFontGtk::GetBaseline() const {
   return ascent_;
 }
 
 int PlatformFontGtk::GetAverageCharacterWidth() const {
   return SkScalarRound(average_width_);
 }
 
 int PlatformFontGtk::GetStringWidth(const std::wstring& text) const {
   int width = 0, height = 0;
-  CanvasSkia::SizeStringInt(text, Font(const_cast<PlatformFontGtk*>(this)),
+  CanvasSkia::SizeStringInt(WideToUTF16Hack(text),
+                            Font(const_cast<PlatformFontGtk*>(this)),
                             &width, &height, gfx::Canvas::NO_ELLIPSIS);
   return width;
 }
 
 int PlatformFontGtk::GetExpectedTextWidth(int length) const {
   double char_width = const_cast<PlatformFontGtk*>(this)->GetAverageWidth();
   return round(static_cast<float>(length) * char_width);
 }
 
 int PlatformFontGtk::GetStyle() const {
@@ skipping 199 matching lines @@
   return new PlatformFontGtk(native_font);
 }
 
 // static
 PlatformFont* PlatformFont::CreateFromNameAndSize(const std::wstring& font_name,
                                                   int font_size) {
   return new PlatformFontGtk(font_name, font_size);
 }
 
 }  // namespace gfx