Revert 71167 - Remove wstring from gfx....

chrome/browser/gtk/options/fonts_page_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/options/fonts_page_gtk.h"
 
 #include <string>
 
 #include "app/l10n_util.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/default_encoding_combo_model.h"
 #include "chrome/browser/gtk/gtk_util.h"
 #include "chrome/browser/gtk/options/options_layout_gtk.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/pref_names.h"
 #include "gfx/font.h"
 #include "grit/generated_resources.h"
 
 namespace {
 
 // Make a Gtk font name string from a font family name and pixel size.
 std::string MakeFontName(std::string family_name, int pixel_size) {
   // The given font might not be available (the default fonts we use are not
   // installed by default on some distros).  So figure out which font we are
   // actually falling back to and display that.  (See crbug.com/31381.)
-  string16 actual_family_name = gfx::Font(
-      UTF8ToUTF16(family_name), pixel_size).GetFontName();
+  std::wstring actual_family_name = gfx::Font(
+      UTF8ToWide(family_name), pixel_size).GetFontName();
   std::string fontname;
   // TODO(mattm): We can pass in the size in pixels (px), and the font button
   // actually honors it, but when you open the selector it interprets it as
   // points.  See crbug.com/17857
   base::SStringPrintf(&fontname, "%s, %dpx",
-                      UTF16ToUTF8(actual_family_name).c_str(), pixel_size);
+                      WideToUTF8(actual_family_name).c_str(), pixel_size);
   return fontname;
 }
 
 }  // namespace
 
 FontsPageGtk::FontsPageGtk(Profile* profile) : OptionsPageBase(profile) {
   Init();
 }
 
 FontsPageGtk::~FontsPageGtk() {
@@ skipping 134 matching lines @@
   SetFontsFromButton(&fixed_width_name_,
                      &fixed_width_size_,
                      font_button);
 }
 
 void FontsPageGtk::OnDefaultEncodingChanged(GtkWidget* combo_box) {
   int index = gtk_combo_box_get_active(GTK_COMBO_BOX(combo_box));
   default_encoding_.SetValue(default_encoding_combobox_model_->
       GetEncodingCharsetByIndex(index));
 }