Revert 71167 - Remove wstring from gfx....

gfx/canvas_skia.cc

 // 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/canvas_skia.h"
 
 #include <limits>
 
 #include "base/i18n/rtl.h"
 #include "base/logging.h"
@@ skipping 259 matching lines @@
   // by the paint).
   SkPaint p(paint);
   p.setFilterBitmap(filter);
   p.setShader(shader);
   shader->unref();
 
   // The rect will be filled by the bitmap.
   drawRect(dest_rect, p);
 }
 
-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) {
   DrawStringInt(text, font, color, x, y, w, h,
                 gfx::CanvasSkia::DefaultCanvasTextAlignment());
 }
 
-void CanvasSkia::DrawStringInt(const string16& text,
+void CanvasSkia::DrawStringInt(const std::wstring& text,
                                const gfx::Font& font,
                                const SkColor& color,
                                const gfx::Rect& display_rect) {
   DrawStringInt(text, font, color, display_rect.x(), display_rect.y(),
                 display_rect.width(), display_rect.height());
 }
 
 void CanvasSkia::TileImageInt(const SkBitmap& bitmap,
                               int x, int y, int w, int h) {
   TileImageInt(bitmap, 0, 0, x, y, w, h);
@@ skipping 83 matching lines @@
 
 CanvasPaint* CanvasPaint::CreateCanvasPaint(gfx::NativeView view) {
 #if defined(OS_WIN)
   return new CanvasPaintWin(view);
 #else
   return NULL;
 #endif
 }
 
 }  // namespace gfx