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

content/ppapi_plugin/ppapi_plugin_main.cc

Index: content/ppapi_plugin/ppapi_plugin_main.cc
diff --git a/content/ppapi_plugin/ppapi_plugin_main.cc b/content/ppapi_plugin/ppapi_plugin_main.cc
index 0b7effaa44af9565a0a4351a826df353ae7e36d1..fccb830e7cbbfdfbbc527e3bbb9ae73fa09a6ae0 100644
--- a/content/ppapi_plugin/ppapi_plugin_main.cc
+++ b/content/ppapi_plugin/ppapi_plugin_main.cc
@@ -29,8 +29,6 @@
 #include "base/win/win_util.h"
 #include "base/win/windows_version.h"
 #include "content/child/dwrite_font_proxy/dwrite_font_proxy_init_win.h"
-#include "content/child/font_warmup_win.h"
-#include "content/public/common/dwrite_font_platform_win.h"
 #include "sandbox/win/src/sandbox.h"
 #include "third_party/WebKit/public/web/win/WebFontRendering.h"
 #include "third_party/skia/include/ports/SkTypeface_win.h"
@@ -142,11 +140,7 @@ int PpapiPluginMain(const MainFunctionParams& parameters) {
     gfx::win::MaybeInitializeDirectWrite();
   bool use_direct_write = gfx::win::IsDirectWriteEnabled();
   if (use_direct_write) {
-    if (ShouldUseDirectWriteFontProxyFieldTrial()) {
-      InitializeDWriteFontProxy();
-    } else {
-      WarmupDirectWrite();
-    }
+    InitializeDWriteFontProxy();
   } else {
     SkTypeface_SetEnsureLOGFONTAccessibleProc(SkiaPreCacheFont);
   }
@@ -158,8 +152,7 @@ int PpapiPluginMain(const MainFunctionParams& parameters) {
   main_message_loop.Run();
 
 #if defined(OS_WIN)
-  if (ShouldUseDirectWriteFontProxyFieldTrial())
-    UninitializeDWriteFontProxy();
+  UninitializeDWriteFontProxy();
 #endif
   return 0;
 }