Index: content/test/layouttest_support.cc |
diff --git a/content/test/layouttest_support.cc b/content/test/layouttest_support.cc |
index 68869aca3b199f4ade5338c4cacf7fc3323173e1..57302c5e0775565c4f834207b90ac55528a0734c 100644 |
--- a/content/test/layouttest_support.cc |
+++ b/content/test/layouttest_support.cc |
@@ -37,9 +37,9 @@ |
#if defined(OS_MACOSX) |
#include "content/browser/frame_host/popup_menu_helper_mac.h" |
#elif defined(OS_WIN) |
-#include "content/common/font_warmup_win.h" |
#include "third_party/WebKit/public/web/win/WebFontRendering.h" |
#include "third_party/skia/include/ports/SkFontMgr.h" |
+#include "third_party/skia/include/ports/SkTypeface_win.h" |
#include "ui/gfx/win/direct_write.h" |
#endif |
@@ -100,7 +100,6 @@ void RegisterSideloadedTypefaces(SkFontMgr* fontmgr) { |
i != files.end(); |
++i) { |
SkTypeface* typeface = fontmgr->createFromFile(i->c_str()); |
- DoPreSandboxWarmupForTypeface(typeface); |
blink::WebFontRendering::addSideloadedFontForTesting(typeface); |
} |
} |
@@ -172,7 +171,7 @@ void EnableRendererLayoutTestMode() { |
#if defined(OS_WIN) |
if (gfx::win::ShouldUseDirectWrite()) |
- RegisterSideloadedTypefaces(GetPreSandboxWarmupFontMgr()); |
+ RegisterSideloadedTypefaces(SkFontMgr_New_DirectWrite()); |
#endif |
} |