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

content/renderer/renderer_main_platform_delegate_win.cc

Index: content/renderer/renderer_main_platform_delegate_win.cc
diff --git a/content/renderer/renderer_main_platform_delegate_win.cc b/content/renderer/renderer_main_platform_delegate_win.cc
index 714ccab86f2e1c46d6878ae312901da841eddccb..25381a5efaae4dc99c6dfb07f37a661260538a88 100644
--- a/content/renderer/renderer_main_platform_delegate_win.cc
+++ b/content/renderer/renderer_main_platform_delegate_win.cc
@@ -16,7 +16,6 @@
 #include "content/child/dwrite_font_proxy/dwrite_font_proxy_init_win.h"
 #include "content/child/font_warmup_win.h"
 #include "content/public/common/content_switches.h"
-#include "content/public/common/dwrite_font_platform_win.h"
 #include "content/public/common/injection_test_win.h"
 #include "content/public/renderer/render_thread.h"
 #include "content/renderer/render_thread_impl.h"
@@ -69,10 +68,7 @@ void RendererMainPlatformDelegate::PlatformInitialize() {
     scoped_ptr<icu::TimeZone> zone(icu::TimeZone::createDefault());
 
     if (use_direct_write) {
-      if (ShouldUseDirectWriteFontProxyFieldTrial())
-        InitializeDWriteFontProxy();
-      else
-        WarmupDirectWrite();
+      InitializeDWriteFontProxy();
     } else {
       SkTypeface_SetEnsureLOGFONTAccessibleProc(SkiaPreCacheFont);
     }
@@ -82,8 +78,7 @@ void RendererMainPlatformDelegate::PlatformInitialize() {
 }
 
 void RendererMainPlatformDelegate::PlatformUninitialize() {
-  if (ShouldUseDirectWriteFontProxyFieldTrial())
-    UninitializeDWriteFontProxy();
+  UninitializeDWriteFontProxy();
 }
 
 bool RendererMainPlatformDelegate::EnableSandbox() {