Remove wstring from gfx.

gfx/canvas_skia_linux.cc

Index: gfx/canvas_skia_linux.cc
===================================================================
--- gfx/canvas_skia_linux.cc	(revision 71043)
+++ gfx/canvas_skia_linux.cc	(working copy)
@@ -162,7 +162,7 @@
 class DrawStringContext {
  public:
   DrawStringContext(gfx::CanvasSkia* canvas,
-                    const std::wstring& text,
+                    const string16& text,
                     const gfx::Font& font,
                     const gfx::Rect& bounds,
                     const gfx::Rect& clip,
@@ -191,7 +191,7 @@
 };
 
 DrawStringContext::DrawStringContext(gfx::CanvasSkia* canvas,
-                                     const std::wstring& text,
+                                     const string16& text,
                                      const gfx::Font& font,
                                      const gfx::Rect& bounds,
                                      const gfx::Rect& clip,
@@ -211,8 +211,7 @@
   cr_ = canvas_->beginPlatformPaint();
   layout_ = pango_cairo_create_layout(cr_);
 
-  SetupPangoLayout(layout_, WideToUTF16Hack(text), font, bounds_.width(),
-                   flags_);
+  SetupPangoLayout(layout_, text, font, bounds_.width(), flags_);
 
   pango_layout_set_height(layout_, bounds_.height() * PANGO_SCALE);
 
@@ -346,7 +345,7 @@
   cairo_surface_destroy(surface);
 }
 
-void CanvasSkia::DrawStringWithHalo(const std::wstring& text,
+void CanvasSkia::DrawStringWithHalo(const string16& text,
                                     const gfx::Font& font,
                                     const SkColor& text_color,
                                     const SkColor& halo_color,
@@ -361,7 +360,7 @@
   context.DrawWithHalo(text_color, halo_color);
 }
 
-void CanvasSkia::DrawStringInt(const std::wstring& text,
+void CanvasSkia::DrawStringInt(const string16& text,
                                const gfx::Font& font,
                                const SkColor& color,
                                int x, int y, int w, int h,