Revert 71167 - Remove wstring from gfx....

chrome/browser/gtk/bookmark_utils_gtk.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 "chrome/browser/gtk/bookmark_utils_gtk.h"
 
 #include "app/gtk_dnd_util.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/pickle.h"
@@ skipping 121 matching lines @@
   gdk_cairo_set_source_pixbuf(cr, data->favicon, 0, 0);
   cairo_paint(cr);
   cairo_destroy(cr);
 
   // Paint the title text.
   gfx::CanvasSkiaPaint canvas(event, false);
   int text_x = gdk_pixbuf_get_width(data->favicon) + kBarButtonPadding;
   int text_width = sender->allocation.width - text_x;
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   const gfx::Font& base_font = rb.GetFont(ResourceBundle::BaseFont);
-  canvas.DrawStringInt(data->text, base_font, data->text_color,
+  canvas.DrawStringInt(UTF16ToWide(data->text),
+                       base_font, data->text_color,
                        text_x, 0, text_width, sender->allocation.height);
 
   return TRUE;
 }
 
 void OnDragIconDestroy(GtkWidget* drag_icon,
                        DragRepresentationData* data) {
   g_object_unref(drag_icon);
   delete data;
 }
@@ skipping 278 matching lines @@
   GURL url;
   string16 title;
   if (!gtk_dnd_util::ExtractNetscapeURL(selection_data, &url, &title))
     return false;
 
   model->AddURL(parent, idx, title, url);
   return true;
 }
 
 }  // namespace bookmark_utils