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

ui/gfx/render_text_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/render_text_win.h"
 
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "base/string_util.h"
 #include "ui/gfx/canvas.h"
@@ skipping 588 matching lines @@
   paint.setSubpixelText(true);
   paint.setLCDRenderText(true);
   SkPoint point(SkPoint::Make(SkIntToScalar(offset.x()),
       SkIntToScalar(display_rect().height() - offset.y())));
   scoped_array<SkPoint> pos;
   for (size_t i = 0; i < runs_.size(); ++i) {
     // Get the run specified by the visual-to-logical map.
     internal::TextRun* run = runs_[visual_to_logical_[i]];
 
     // TODO(msw): Font default/fallback and style integration.
-    std::string font(UTF16ToASCII(run->font.GetFontName()));
+    std::string font(run->font.GetFontName());
     SkTypeface::Style style = SkTypeface::kNormal;
     SkTypeface* typeface = SkTypeface::CreateFromName(font.c_str(), style);
     if (typeface) {
       paint.setTypeface(typeface);
       // |paint| adds its own ref. Release the ref from CreateFromName.
       typeface->unref();
     }
     paint.setTextSize(run->font.GetFontSize());
     paint.setColor(run->foreground);
 
@@ skipping 32 matching lines @@
     Rect r(GetUpdatedCursorBounds());
     canvas->DrawRectInt(kCursorColor, r.x(), r.y(), r.width(), r.height());
   }
 }
 
 RenderText* RenderText::CreateRenderText() {
   return new RenderTextWin;
 }
 
 }  // namespace gfx