Clean up SkFontConfigInterface implementation.

include/ports/SkFontConfigInterface.h

Index: include/ports/SkFontConfigInterface.h
diff --git a/include/ports/SkFontConfigInterface.h b/include/ports/SkFontConfigInterface.h
index 3c68a242e54f0a270fbae89d4b715dec59086b7b..72cad0ad6b93551613a4bae5541e4b6a0429480b 100644
--- a/include/ports/SkFontConfigInterface.h
+++ b/include/ports/SkFontConfigInterface.h
@@ -14,6 +14,7 @@
 #include "SkTypeface.h"
 
 struct SkBaseMutex;
+class SkFontMgr;
 
 /**
  *  \class SkFontConfigInterface
@@ -23,7 +24,6 @@ struct SkBaseMutex;
  */
 class SK_API SkFontConfigInterface : public SkRefCnt {
 public:
-    
 
     /**
      *  Returns the global SkFontConfigInterface instance, and if it is not
@@ -110,7 +110,7 @@ public:
      *  libfontconfig. This does not affect the refcnt of the returned instance.
      *  The mutex may be used to guarantee the singleton is only constructed once.
      */
-    static SkFontConfigInterface* GetSingletonDirectInterface(SkBaseMutex* mutex = NULL);
+    static SkFontConfigInterface* GetSingletonDirectInterface();
 
     // New APIS, which have default impls for now (which do nothing)
 
@@ -118,4 +118,7 @@ public:
     typedef SkRefCnt INHERITED;
 };
 
+/** Creates a SkFontMgr which wraps a SkFontConfigInterface. */
+SK_API SkFontMgr* SkFontMgr_New_FCI(SkFontConfigInterface* fci);
+
 #endif