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

chrome/common/badge_util.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 "chrome/common/badge_util.h"
 
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "third_party/skia/include/core/SkTypeface.h"
@@ skipping 23 matching lines @@
     if (typeface) {
       text_paint->setFakeBoldText(true);
     } else {
       // Fall back to the system font. We don't bold it because we aren't sure
       // how it will look.
       // For the most part this code path will only be hit on Linux systems
       // that don't have Arial.
       ResourceBundle& rb = ResourceBundle::GetSharedInstance();
       const gfx::Font& base_font = rb.GetFont(ResourceBundle::BaseFont);
       typeface = SkTypeface::CreateFromName(
-          UTF16ToUTF8(base_font.GetFontName()).c_str(), SkTypeface::kNormal);
+          base_font.GetFontName().c_str(), SkTypeface::kNormal);
       DCHECK(typeface);
     }
 
     text_paint->setTypeface(typeface);
     // |text_paint| adds its own ref. Release the ref from CreateFontName.
     typeface->unref();
   }
   return text_paint;
 }
 
@@ skipping 38 matching lines @@
   SkScalar x = (badge_width - text_width)/2;
   SkScalar y = (icon.height() - font_size)/2 + font_size - 1;
   canvas->sk_canvas()->drawText(
       badge_text.c_str(), badge_text.size(), x, y, *paint);
 
   // Return the generated image.
   return canvas->ExtractBitmap();
 }
 
 }  // namespace badge_util