Change string16 to std::string in the gfx::Font() interface.

ui/gfx/platform_font_win.cc

 // Copyright (c) 2011 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 "ui/gfx/platform_font_win.h"
 
 #include <windows.h>
 #include <math.h>
 
 #include <algorithm>
@@ skipping 51 matching lines @@
 }
 
 PlatformFontWin::PlatformFontWin(const Font& other) {
   InitWithCopyOfHFONT(other.GetNativeFont());
 }
 
 PlatformFontWin::PlatformFontWin(NativeFont native_font) {
   InitWithCopyOfHFONT(native_font);
 }
 
-PlatformFontWin::PlatformFontWin(const string16& font_name,
+PlatformFontWin::PlatformFontWin(const std::string& font_name,
                                  int font_size) {
   InitWithFontNameAndSize(font_name, font_size);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // PlatformFontWin, PlatformFont implementation:
 
 Font PlatformFontWin::DeriveFont(int size_delta, int style) const {
   LOGFONT font_info;
   GetObject(GetNativeFont(), sizeof(LOGFONT), &font_info);
@@ skipping 27 matching lines @@
 }
 
 int PlatformFontWin::GetExpectedTextWidth(int length) const {
   return length * std::min(font_ref_->dlu_base_x(), GetAverageCharacterWidth());
 }
 
 int PlatformFontWin::GetStyle() const {
   return font_ref_->style();
 }
 
-string16 PlatformFontWin::GetFontName() const {
+std::string PlatformFontWin::GetFontName() const {
   return font_ref_->font_name();
 }
 
 int PlatformFontWin::GetFontSize() const {
   LOGFONT font_info;
   GetObject(font_ref_->hfont(), sizeof(LOGFONT), &font_info);
   DCHECK_LT(font_info.lfHeight, 0);
   return -font_info.lfHeight;
 }
 
 NativeFont PlatformFontWin::GetNativeFont() const {
   return font_ref_->hfont();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // Font, private:
 
 void PlatformFontWin::InitWithCopyOfHFONT(HFONT hfont) {
   DCHECK(hfont);
   LOGFONT font_info;
   GetObject(hfont, sizeof(LOGFONT), &font_info);
   font_ref_ = CreateHFontRef(CreateFontIndirect(&font_info));
 }
 
-void PlatformFontWin::InitWithFontNameAndSize(const string16& font_name,
+void PlatformFontWin::InitWithFontNameAndSize(const std::string& font_name,
                                               int font_size) {
   HFONT hf = ::CreateFont(-font_size, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-                          font_name.c_str());
+                          UTF8ToUTF16(font_name).c_str());
   font_ref_ = CreateHFontRef(hf);
 }
 
 // static
 PlatformFontWin::HFontRef* PlatformFontWin::GetBaseFontRef() {
   if (base_font_ref_ == NULL) {
     NONCLIENTMETRICS metrics;
     base::win::GetNonClientMetrics(&metrics);
 
     if (adjust_font_callback)
@@ skipping 58 matching lines @@
     : hfont_(hfont),
       height_(height),
       baseline_(baseline),
       ave_char_width_(ave_char_width),
       style_(style),
       dlu_base_x_(dlu_base_x) {
   DLOG_ASSERT(hfont);
 
   LOGFONT font_info;
   GetObject(hfont_, sizeof(LOGFONT), &font_info);
-  font_name_ = string16(font_info.lfFaceName);
+  font_name_ = UTF16ToUTF8(string16(font_info.lfFaceName));
 }
 
 PlatformFontWin::HFontRef::~HFontRef() {
   DeleteObject(hfont_);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // PlatformFont, public:
 
 // static
 PlatformFont* PlatformFont::CreateDefault() {
   return new PlatformFontWin;
 }
 
 // static
 PlatformFont* PlatformFont::CreateFromFont(const Font& other) {
   return new PlatformFontWin(other);
 }
 
 // static
 PlatformFont* PlatformFont::CreateFromNativeFont(NativeFont native_font) {
   return new PlatformFontWin(native_font);
 }
 
 // static
-PlatformFont* PlatformFont::CreateFromNameAndSize(const string16& font_name,
+PlatformFont* PlatformFont::CreateFromNameAndSize(const std::string& font_name,
                                                   int font_size) {
   return new PlatformFontWin(font_name, font_size);
 }
 
 }  // namespace gfx