Revert "Revert of Remove font cache code (patchset #3 id:40001 of https://codereview.chromium.org/1…

content/test/layouttest_support.cc

Index: content/test/layouttest_support.cc
diff --git a/content/test/layouttest_support.cc b/content/test/layouttest_support.cc
index 5ec52f637b519467b6ddf013663c7ba3cf6cd587..e0d4fa0e7c1dadd93468fba06d0c0f9503e0b28c 100644
--- a/content/test/layouttest_support.cc
+++ b/content/test/layouttest_support.cc
@@ -41,7 +41,6 @@
 #include "content/browser/frame_host/popup_menu_helper_mac.h"
 #elif defined(OS_WIN)
 #include "content/child/font_warmup_win.h"
-#include "content/public/common/dwrite_font_platform_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"
@@ -103,8 +102,6 @@ void RegisterSideloadedTypefaces(SkFontMgr* fontmgr) {
        i != files.end();
        ++i) {
     SkTypeface* typeface = fontmgr->createFromFile(i->c_str());
-    if (!ShouldUseDirectWriteFontProxyFieldTrial())
-      DoPreSandboxWarmupForTypeface(typeface);
     blink::WebFontRendering::addSideloadedFontForTesting(typeface);
   }
 }
@@ -169,10 +166,7 @@ void EnableRendererLayoutTestMode() {
 
 #if defined(OS_WIN)
   if (gfx::win::ShouldUseDirectWrite()) {
-    if (ShouldUseDirectWriteFontProxyFieldTrial())
-      RegisterSideloadedTypefaces(SkFontMgr_New_DirectWrite());
-    else
-      RegisterSideloadedTypefaces(GetPreSandboxWarmupFontMgr());
+    RegisterSideloadedTypefaces(SkFontMgr_New_DirectWrite());
   }
 #endif
 }