Convert SizeStringInt from taking a wstring to a string16.

gfx/canvas_skia_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.
 
 #import <Cocoa/Cocoa.h>
 
 #include "gfx/canvas_skia.h"
 
 #include "base/mac/scoped_cftyperef.h"
 #include "base/sys_string_conversions.h"
 #include "gfx/font.h"
 #include "gfx/rect.h"
 #include "third_party/skia/include/core/SkShader.h"
 
 namespace gfx {
 
 CanvasSkia::CanvasSkia(int width, int height, bool is_opaque)
     : skia::PlatformCanvas(width, height, is_opaque) {
 }
 
 CanvasSkia::CanvasSkia() : skia::PlatformCanvas() {
 }
 
 CanvasSkia::~CanvasSkia() {
 }
 
 // static
-void CanvasSkia::SizeStringInt(const std::wstring& text,
+void CanvasSkia::SizeStringInt(const string16& text,
                                const gfx::Font& font,
                                int* width, int* height,
                                int flags) {
   NSFont* native_font = font.GetNativeFont();
-  NSString* ns_string = base::SysWideToNSString(text);
+  NSString* ns_string = base::SysUTF16ToNSString(text);
   NSDictionary* attributes =
       [NSDictionary dictionaryWithObject:native_font
                                   forKey:NSFontAttributeName];
   NSSize string_size = [ns_string sizeWithAttributes:attributes];
   *width = string_size.width;
   *height = font.GetHeight();
 }
 
 void CanvasSkia::DrawStringInt(const std::wstring& text,
                                const gfx::Font& font,
@@ skipping 35 matching lines @@
   CGPathAddRect(path, NULL, text_bounds);
 
   base::mac::ScopedCFTypeRef<CTFrameRef> frame(
       CTFramesetterCreateFrame(framesetter, CFRangeMake(0, 0), path, NULL));
   CTFrameDraw(frame, context);
   CGContextRestoreGState(context);
   endPlatformPaint();
 }
 
 }  // namespace gfx