Remove use of legacy SkFontMgr factories.

content/test/layouttest_support.cc

Index: content/test/layouttest_support.cc
diff --git a/content/test/layouttest_support.cc b/content/test/layouttest_support.cc
index fefd00efdf062bb27b479e32d044f8641eb3f324..53e360aef661ab122daa27dfb5869242a39a3ddb 100644
--- a/content/test/layouttest_support.cc
+++ b/content/test/layouttest_support.cc
@@ -60,6 +60,7 @@
 #elif defined(OS_WIN)
 #include "content/child/font_warmup_win.h"
 #include "third_party/WebKit/public/web/win/WebFontRendering.h"
+#include "third_party/skia/include/core/SkRefCnt.h"
 #include "third_party/skia/include/ports/SkFontMgr.h"
 #include "third_party/skia/include/ports/SkTypeface_win.h"
 #include "ui/gfx/win/direct_write.h"
@@ -152,7 +153,7 @@ float GetWindowToViewportScale(RenderWidget* render_widget) {
 #if defined(OS_WIN)
 // DirectWrite only has access to %WINDIR%\Fonts by default. For developer
 // side-loading, support kRegisterFontFiles to allow access to additional fonts.
-void RegisterSideloadedTypefaces(SkFontMgr* fontmgr) {
+void RegisterSideloadedTypefaces(sk_sp<SkFontMgr> fontmgr) {

[f(malita), 2017/01/09 15:25:34]

looks like we're not passing a ref here - can this be const sk_sp<SkFontMgr>&?

[bungeman-chromium, 2017/01/09 19:15:28]

I did it this way because previously the caller was leaking because this wasn't
taking ownership. Now that the the one caller of this has a smart pointer in
hand, maybe it should be up to them to handle that and let this just borrow that
ownership. In which case this should just get a non-owning raw pointer.

   std::vector<std::string> files = switches::GetSideloadFontFiles();
   for (std::vector<std::string>::const_iterator i(files.begin());
        i != files.end();