Convert SizeStringInt from taking a wstring to a string16.

gfx/canvas_skia.h

 // 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.
 
 #ifndef GFX_CANVAS_SKIA_H_
 #define GFX_CANVAS_SKIA_H_
 #pragma once
 
 #include "base/basictypes.h"
+#include "base/string16.h"
 #include "gfx/canvas.h"
 #include "skia/ext/platform_canvas.h"
 
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
 typedef struct _GdkPixbuf GdkPixbuf;
 #endif
 
 namespace gfx {
 
 class Canvas;
@@ skipping 21 matching lines @@
   CanvasSkia();
 
   CanvasSkia(int width, int height, bool is_opaque);
 
   virtual ~CanvasSkia();
 
   // Compute the size required to draw some text with the provided font.
   // Attempts to fit the text with the provided width and height. Increases
   // height and then width as needed to make the text fit. This method
   // supports multiple lines.
-  static void SizeStringInt(const std::wstring& text,
+  static void SizeStringInt(const string16& text,
                             const gfx::Font& font,
                             int* width, int* height,
                             int flags);
 
   // Returns the default text alignment to be used when drawing text on a
   // gfx::CanvasSkia based on the directionality of the system locale language.
   // This function is used by gfx::Canvas::DrawStringInt when the text alignment
   // is not specified.
   //
   // This function returns either gfx::Canvas::TEXT_ALIGN_LEFT or
@@ skipping 91 matching lines @@
                      int x, int y, int w, int h,
                      int flags);
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(CanvasSkia);
 };
 
 }  // namespace gfx;
 
 #endif  // GFX_CANVAS_SKIA_H_