Pass the IDWriteFactory instead of relying on a global creator.

gm/fontmgr.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "gm.h"
 #include "SkCanvas.h"
 #include "SkFontMgr.h"
 #include "SkGraphics.h"
 #include "SkTypeface.h"
 
 #ifdef SK_BUILD_FOR_WIN
     #include "SkTypeface_win.h"
 #endif
 
 // limit this just so we don't take too long to draw
 #define MAX_FAMILIES    30
 
 static SkScalar drawString(SkCanvas* canvas, const SkString& text, SkScalar x,
                            SkScalar y, const SkPaint& paint) {
     canvas->drawText(text.c_str(), text.size(), x, y, paint);
     return x + paint.measureText(text.c_str(), text.size());
 }
 
 class FontMgrGM : public skiagm::GM {
 public:
-    FontMgrGM(SkFontMgr* (*factory)() = NULL) {
+    FontMgrGM(SkFontMgr* fontMgr = NULL) {
         SkGraphics::SetFontCacheLimit(16 * 1024 * 1024);
 
         fName.set("fontmgr_iter");
-        if (factory) {
+        if (fontMgr) {
             fName.append("_factory");
-            fFM.reset(factory());
+            fFM.reset(fontMgr);
         } else {
             fFM.reset(SkFontMgr::RefDefault());
         }
     }
 
 protected:
     virtual SkString onShortName() {
         return fName;
     }
 
@@ skipping 142 matching lines @@
 private:
     typedef GM INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 DEF_GM( return SkNEW(FontMgrGM); )
 DEF_GM( return SkNEW(FontMgrMatchGM); )
 
 #ifdef SK_BUILD_FOR_WIN
-    DEF_GM( return SkNEW_ARGS(FontMgrGM, (SkFontMgr_New_DirectWrite)); )
+    DEF_GM( return SkNEW_ARGS(FontMgrGM, (SkFontMgr_New_DirectWrite())); )
 #endif