Revert 71167 - Remove wstring from gfx....

gfx/canvas_skia_mac.mm

Index: gfx/canvas_skia_mac.mm
===================================================================
--- gfx/canvas_skia_mac.mm	(revision 71168)
+++ gfx/canvas_skia_mac.mm	(working copy)
@@ -39,7 +39,7 @@
   *height = font.GetHeight();
 }
 
-void CanvasSkia::DrawStringInt(const string16& text,
+void CanvasSkia::DrawStringInt(const std::wstring& text,
                                const gfx::Font& font,
                                const SkColor& color,
                                int x, int y, int w, int h,
@@ -68,8 +68,8 @@
           nil];
 
   NSAttributedString* ns_string =
-      [[[NSAttributedString alloc] initWithString:base::SysUTF16ToNSString(text)
-                                       attributes:attributes] autorelease];
+      [[[NSAttributedString alloc] initWithString:base::SysWideToNSString(text)
+                                        attributes:attributes] autorelease];
   base::mac::ScopedCFTypeRef<CTFramesetterRef> framesetter(
       CTFramesetterCreateWithAttributedString(
       reinterpret_cast<CFAttributedStringRef>(ns_string)));