Remove wstring from gfx.

views/controls/textfield/gtk_views_textview.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 "views/controls/textfield/gtk_views_textview.h"
 
 #include "base/utf_string_conversions.h"
 #include "gfx/canvas_skia_paint.h"
 #include "gfx/insets.h"
 #include "gfx/skia_utils_gtk.h"
@@ skipping 32 matching lines @@
   if (host && event->window == text_window &&
       !host->textfield()->text_to_display_when_empty().empty() &&
       gtk_text_iter_equal(&start, &end)) {
     gfx::CanvasSkiaPaint canvas(event);
     if (!canvas.is_empty()) {
       gfx::Insets insets =
           views::NativeTextfieldGtk::GetTextViewInnerBorder(text_view);
       gfx::Font font = host->textfield()->font();
       const string16 text = host->textfield()->text_to_display_when_empty();
       canvas.DrawStringInt(
-          UTF16ToWide(text), font,
+          text, font,
           gfx::GdkColorToSkColor(widget->style->text[GTK_STATE_INSENSITIVE]),
           insets.left(), insets.top(),
           widget->allocation.width - insets.width(), font.GetHeight());
     }
   }
 
   // Draw border and focus.
   if (event->window == widget->window) {
     gint width;
     gint height;
@@ skipping 28 matching lines @@
   text_view->host = NULL;
 }
 
 GtkWidget* gtk_views_textview_new(views::NativeTextfieldGtk* host) {
   gpointer text_view = g_object_new(GTK_TYPE_VIEWS_TEXTVIEW, NULL);
   GTK_VIEWS_TEXTVIEW(text_view)->host = host;
   return GTK_WIDGET(text_view);
 }
 
 G_END_DECLS