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

content/common/font_warmup_win.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/common/font_warmup_win.h"
 
 #include <dwrite.h>
 #include <stdint.h>
 #include <map>
 
@@ skipping 464 matching lines @@
 
 SkFontMgr* GetPreSandboxWarmupFontMgr() {
   if (!g_warmup_fontmgr) {
     IDWriteFactory* factory;
     CreateDirectWriteFactory(&factory);
 
     GetCustomFontCollection(factory);
 
     PatchDWriteFactory(factory);
 
-    blink::WebFontRendering::setDirectWriteFactory(factory);
     g_warmup_fontmgr = SkFontMgr_New_DirectWrite(factory);
+    blink::WebFontRendering::setSkiaFontManager(g_warmup_fontmgr);
   }
   return g_warmup_fontmgr;
 }
 
 GdiFontPatchData* PatchGdiFontEnumeration(const base::FilePath& path) {
   if (ShouldUseDirectWriteFontProxyFieldTrial() && !g_warmup_fontmgr)
     g_warmup_fontmgr = SkFontMgr_New_DirectWrite();
   // If not using the font proxy, we assume |g_warmup_fontmgr| is already
   // initialized before this function is called.
   DCHECK(g_warmup_fontmgr);
@@ skipping 23 matching lines @@
   // down for the CC HUD code, so use the same one here. Note that we don't use
   // a monospace as would be nice in an attempt to avoid a small startup time
   // regression, see http://crbug.com/463613.
   skia::RefPtr<SkTypeface> hud_typeface = skia::AdoptRef(
       GetPreSandboxWarmupFontMgr()->legacyCreateTypeface("Times New Roman", 0));
   DoPreSandboxWarmupForTypeface(hud_typeface.get());
   gfx::SetHudTypeface(hud_typeface);
 }
 
 }  // namespace content