Revert of Add plumbing in blink to allow overriding the default font collection.

third_party/WebKit/Source/platform/fonts/FontCache.h

Index: third_party/WebKit/Source/platform/fonts/FontCache.h
diff --git a/third_party/WebKit/Source/platform/fonts/FontCache.h b/third_party/WebKit/Source/platform/fonts/FontCache.h
index cbf5096d0f3d0090660fc593fcd8992ac4db2f5d..1b83f7de4b67e8da6b8d81a40b1c935b0e982c66 100644
--- a/third_party/WebKit/Source/platform/fonts/FontCache.h
+++ b/third_party/WebKit/Source/platform/fonts/FontCache.h
@@ -46,6 +46,7 @@
 
 #if OS(WIN)
 #include "SkFontMgr.h"
+struct IDWriteFactory;
 #endif
 
 class SkTypeface;
@@ -106,7 +107,7 @@
     static bool useDirectWrite() { return s_useDirectWrite; }
     static float deviceScaleFactor() { return s_deviceScaleFactor; }
     static void setUseDirectWrite(bool useDirectWrite) { s_useDirectWrite = useDirectWrite; }
-    static void setFontManager(const RefPtr<SkFontMgr>&);
+    static void setDirectWriteFactory(IDWriteFactory* factory) { s_directWriteFactory = factory; }
     static void setDeviceScaleFactor(float deviceScaleFactor) { s_deviceScaleFactor = deviceScaleFactor; }
     static void setUseSubpixelPositioning(bool useSubpixelPositioning) { s_useSubpixelPositioning = useSubpixelPositioning; }
     static void addSideloadedFontForTesting(SkTypeface*);
@@ -175,9 +176,9 @@
     int m_purgePreventCount;
 
 #if OS(WIN)
-    RefPtr<SkFontMgr> m_fontManager;
+    OwnPtr<SkFontMgr> m_fontManager;
     static bool s_useDirectWrite;
-    static SkFontMgr* s_fontManager;
+    static IDWriteFactory* s_directWriteFactory;
     static float s_deviceScaleFactor;
     static bool s_useSubpixelPositioning;
     static HashMap<String, RefPtr<SkTypeface>>* s_sideloadedFonts;