ui/gfx: Use base::string16 now that string16 was moved into base namespace.

ui/gfx/canvas.cc

Index: ui/gfx/canvas.cc
diff --git a/ui/gfx/canvas.cc b/ui/gfx/canvas.cc
index aac2c035bb77f79c9ca1aed1005d365a248781a9..2b0f5046cf0ced0cccf96b9274e1b8965af1e667 100644
--- a/ui/gfx/canvas.cc
+++ b/ui/gfx/canvas.cc
@@ -87,7 +87,7 @@ void Canvas::RecreateBackingCanvas(const gfx::Size& size,
 }
 
 // static
-int Canvas::GetStringWidth(const string16& text, const gfx::Font& font) {
+int Canvas::GetStringWidth(const base::string16& text, const gfx::Font& font) {
   int width = 0, height = 0;
   Canvas::SizeStringInt(text, font, &width, &height, 0, NO_ELLIPSIS);
   return width;
@@ -409,14 +409,14 @@ void Canvas::DrawImageInPath(const gfx::ImageSkia& image,
   canvas_->drawPath(path, p);
 }
 
-void Canvas::DrawStringInt(const string16& text,
+void Canvas::DrawStringInt(const base::string16& text,
                            const gfx::Font& font,
                            SkColor color,
                            int x, int y, int w, int h) {
   DrawStringInt(text, font, color, x, y, w, h, DefaultCanvasTextAlignment());
 }
 
-void Canvas::DrawStringInt(const string16& text,
+void Canvas::DrawStringInt(const base::string16& text,
                            const gfx::Font& font,
                            SkColor color,
                            const gfx::Rect& display_rect) {
@@ -424,7 +424,7 @@ void Canvas::DrawStringInt(const string16& text,
                 display_rect.width(), display_rect.height());
 }
 
-void Canvas::DrawStringInt(const string16& text,
+void Canvas::DrawStringInt(const base::string16& text,
                            const gfx::Font& font,
                            SkColor color,
                            int x, int y, int w, int h,