Revert of Fixes for two different HUD issues related to win32k lockdown

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 dd749c292e6f9497cab6d59f1d8b9e377cb63787..309646c79a15ee9c32c443bca217bfff95ad2666 100644
--- a/content/renderer/renderer_main_platform_delegate_win.cc
+++ b/content/renderer/renderer_main_platform_delegate_win.cc
@@ -23,7 +23,6 @@
 #include "third_party/icu/source/i18n/unicode/timezone.h"
 #include "third_party/skia/include/ports/SkFontMgr.h"
 #include "third_party/skia/include/ports/SkTypeface_win.h"
-#include "ui/gfx/hud_font.h"
 #include "ui/gfx/win/direct_write.h"
 #include "ui/gfx/win/dpi.h"
 
@@ -55,17 +54,10 @@ void SkiaPreCacheFontCharacters(const LOGFONT& logfont,
 void WarmupDirectWrite() {
   // The objects used here are intentionally not freed as we want the Skia
   // code to use these objects after warmup.
-  SetDefaultSkiaFactory(GetPreSandboxWarmupFontMgr());
   SkTypeface* typeface =
       GetPreSandboxWarmupFontMgr()->legacyCreateTypeface("Times New Roman", 0);
   DoPreSandboxWarmupForTypeface(typeface);
-
-  // The CC HUD needs a debug font, we warm that up here and pass it down.
-  skia::RefPtr<SkTypeface> hud_typeface =
-      skia::AdoptRef(GetPreSandboxWarmupFontMgr()->legacyCreateTypeface(
-          "Consolas", SkTypeface::kBold));
-  DoPreSandboxWarmupForTypeface(hud_typeface.get());
-  ui::SetHudTypeface(hud_typeface);
+  SetDefaultSkiaFactory(GetPreSandboxWarmupFontMgr());
 }
 
 }  // namespace