Convert SizeStringInt from taking a wstring to a string16.

gfx/platform_font_mac.mm

 // 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_mac.h"
 
 #include <Cocoa/Cocoa.h>
 
 #include "base/basictypes.h"
 #include "base/scoped_nsobject.h"
 #include "base/sys_string_conversions.h"
+#include "base/utf_string_conversions.h"
 #include "gfx/canvas_skia.h"
 #include "gfx/font.h"
 
 namespace gfx {
 
 ////////////////////////////////////////////////////////////////////////////////
 // PlatformFontMac, public:
 
 PlatformFontMac::PlatformFontMac() {
   font_size_ = [NSFont systemFontSize];
@@ skipping 28 matching lines @@
 int PlatformFontMac::GetBaseline() const {
   return ascent_;
 }
 
 int PlatformFontMac::GetAverageCharacterWidth() const {
   return average_width_;
 }
 
 int PlatformFontMac::GetStringWidth(const std::wstring& text) const {
   int width = 0, height = 0;
-  CanvasSkia::SizeStringInt(text, Font(const_cast<PlatformFontMac*>(this)),
+  CanvasSkia::SizeStringInt(WideToUTF16Hack(text),
+                            Font(const_cast<PlatformFontMac*>(this)),
                             &width, &height, gfx::Canvas::NO_ELLIPSIS);
   return width;
 }
 
 int PlatformFontMac::GetExpectedTextWidth(int length) const {
   return length * average_width_;
 }
 
 int PlatformFontMac::GetStyle() const {
   return style_;
@@ skipping 62 matching lines @@
 }
 
 // static
 PlatformFont* PlatformFont::CreateFromNameAndSize(const std::wstring& font_name,
                                                   int font_size) {
   return new PlatformFontMac(font_name, font_size);
 }
 
 }  // namespace gfx