Revert 71167 - Remove wstring from gfx....

gfx/canvas_direct2d.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_direct2d.h"
 
 #include "base/scoped_ptr.h"
 #include "gfx/brush.h"
 #include "gfx/rect.h"
 
@@ skipping 268 matching lines @@
 
 void CanvasDirect2D::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) {
   NOTIMPLEMENTED();
 }
 
-void CanvasDirect2D::DrawStringInt(const string16& text,
+void CanvasDirect2D::DrawStringInt(const std::wstring& text,
                                    const gfx::Font& font,
                                    const SkColor& color,
                                    int x, int y, int w, int h) {
   NOTIMPLEMENTED();
 }
 
-void CanvasDirect2D::DrawStringInt(const string16& text,
+void CanvasDirect2D::DrawStringInt(const std::wstring& text,
                                    const gfx::Font& font,
                                    const SkColor& color,
                                    const gfx::Rect& display_rect) {
   NOTIMPLEMENTED();
 }
 
-void CanvasDirect2D::DrawStringInt(const string16& text,
+void CanvasDirect2D::DrawStringInt(const std::wstring& text,
                                    const gfx::Font& font,
                                    const SkColor& color,
                                    int x, int y, int w, int h,
                                    int flags) {
   NOTIMPLEMENTED();
 }
 
 void CanvasDirect2D::DrawFocusRect(int x, int y, int width, int height) {
   NOTIMPLEMENTED();
 }
@@ skipping 39 matching lines @@
 // CanvasDirect2D, private:
 
 void CanvasDirect2D::SaveInternal(ID2D1Layer* layer) {
   if (!drawing_state_block_)
     GetD2D1Factory()->CreateDrawingStateBlock(drawing_state_block_.Receive());
   rt_->SaveDrawingState(drawing_state_block_.get());
   state_.push(RenderState(layer));
 }
 
 }  // namespace gfx