Index: content/browser/renderer_host/pepper/pepper_truetype_font_list_win.cc |
diff --git a/content/browser/renderer_host/pepper/pepper_truetype_font_list_win.cc b/content/browser/renderer_host/pepper/pepper_truetype_font_list_win.cc |
index 3530e1e1b5e61c5019ab9bb16aacc43001b816d3..c52ee96aa7ed694e71ea8b24be05dc36c924474c 100644 |
--- a/content/browser/renderer_host/pepper/pepper_truetype_font_list_win.cc |
+++ b/content/browser/renderer_host/pepper/pepper_truetype_font_list_win.cc |
@@ -27,7 +27,7 @@ static int CALLBACK EnumFontFamiliesProc(ENUMLOGFONTEXW* logical_font, |
const LOGFONTW& lf = logical_font->elfLogFont; |
if (lf.lfFaceName[0] && lf.lfFaceName[0] != '@' && |
lf.lfOutPrecision == OUT_STROKE_PRECIS) { // Outline fonts only. |
- std::string face_name(UTF16ToUTF8(lf.lfFaceName)); |
+ std::string face_name(base::UTF16ToUTF8(lf.lfFaceName)); |
font_families->push_back(face_name); |
} |
} |
@@ -44,7 +44,7 @@ static int CALLBACK EnumFontsInFamilyProc(ENUMLOGFONTEXW* logical_font, |
if (lf.lfFaceName[0] && lf.lfFaceName[0] != '@' && |
lf.lfOutPrecision == OUT_STROKE_PRECIS) { // Outline fonts only. |
ppapi::proxy::SerializedTrueTypeFontDesc desc; |
- desc.family = UTF16ToUTF8(lf.lfFaceName); |
+ desc.family = base::UTF16ToUTF8(lf.lfFaceName); |
if (lf.lfItalic) |
desc.style = PP_TRUETYPEFONTSTYLE_ITALIC; |
desc.weight = static_cast<PP_TrueTypeFontWeight_Dev>(lf.lfWeight); |
@@ -73,7 +73,7 @@ void GetFontsInFamily_SlowBlocking(const std::string& family, |
LOGFONTW logfont; |
memset(&logfont, 0, sizeof(logfont)); |
logfont.lfCharSet = DEFAULT_CHARSET; |
- base::string16 family16 = UTF8ToUTF16(family); |
+ base::string16 family16 = base::UTF8ToUTF16(family); |
memcpy(&logfont.lfFaceName, &family16[0], sizeof(logfont.lfFaceName)); |
base::win::ScopedCreateDC hdc(::CreateCompatibleDC(NULL)); |
::EnumFontFamiliesExW(hdc, &logfont, (FONTENUMPROCW)&EnumFontsInFamilyProc, |