Revert 71167 - Remove wstring from gfx....

gfx/canvas.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_H_
 #define GFX_CANVAS_H_
 #pragma once
 
 #include <string>
 
-#include "base/string16.h"
 #include "gfx/native_widget_types.h"
 // TODO(beng): remove this include when we no longer depend on SkTypes.
 #include "skia/ext/platform_canvas.h"
 
 namespace gfx {
 
 class Brush;
 class CanvasSkia;
 class Font;
 class Point;
@@ skipping 143 matching lines @@
                              bool filter) = 0;
   virtual void DrawBitmapInt(const SkBitmap& bitmap,
                              int src_x, int src_y, int src_w, int src_h,
                              int dest_x, int dest_y, int dest_w, int dest_h,
                              bool filter,
                              const SkPaint& paint) = 0;
 
   // Draws text with the specified color, font and location. The text is
   // aligned to the left, vertically centered, clipped to the region. If the
   // text is too big, it is truncated and '...' is added to the end.
-  virtual void DrawStringInt(const string16& text, const
+  virtual void DrawStringInt(const std::wstring& text, const
                              gfx::Font& font,
                              const SkColor& color,
                              int x, int y, int w, int h) = 0;
-  virtual void DrawStringInt(const string16& text,
+  virtual void DrawStringInt(const std::wstring& text,
                              const gfx::Font& font,
                              const SkColor& color,
                              const gfx::Rect& display_rect) = 0;
 
   // Draws text with the specified color, font and location. The last argument
   // specifies flags for how the text should be rendered. It can be one of
   // TEXT_ALIGN_CENTER, TEXT_ALIGN_RIGHT or TEXT_ALIGN_LEFT.
-  virtual void DrawStringInt(const string16& text,
+  virtual void DrawStringInt(const std::wstring& text,
                              const gfx::Font& font,
                              const SkColor& color,
                              int x, int y, int w, int h,
                              int flags) = 0;
 
   // Draws a dotted gray rectangle used for focus purposes.
   virtual void DrawFocusRect(int x, int y, int width, int height) = 0;
 
   // Tiles the image in the specified region.
   virtual void TileImageInt(const SkBitmap& bitmap,
@@ skipping 31 matching lines @@
   // Returns the rectangle that is invalid.
   virtual gfx::Rect GetInvalidRect() const = 0;
 
   // Returns the underlying Canvas.
   virtual Canvas* AsCanvas() = 0;
 };
 
 }  // namespace gfx;
 
 #endif  // GFX_CANVAS_H_