Revert of Extend SkFontMgr_Custom to cover ttc, otf, pfb.

src/ports/SkFontHost_FreeType_common.h

Index: src/ports/SkFontHost_FreeType_common.h
diff --git a/src/ports/SkFontHost_FreeType_common.h b/src/ports/SkFontHost_FreeType_common.h
index f275d4488ce77b0bf679cea650cf732419c30dc0..79e6d651631103642729c4788fc55f8b3bf2ec5b 100644
--- a/src/ports/SkFontHost_FreeType_common.h
+++ b/src/ports/SkFontHost_FreeType_common.h
@@ -48,17 +48,8 @@
     /** For SkFontMgrs to make use of our ability to extract
      *  name and style from a stream, using FreeType's API.
      */
-    class Scanner {
-    public:
-        Scanner();
-        ~Scanner();
-        bool recognizedFont(SkStream* stream, int* numFonts) const;
-        bool scanFont(SkStream* stream, int ttcIndex,
-                      SkString* name, SkFontStyle* style, bool* isFixedPitch) const;
-    private:
-        FT_Face openFace(SkStream* stream, int ttcIndex) const;
-        FT_Library fLibrary;
-    };
+    static bool ScanFont(SkStream* stream, int ttcIndex,
+                         SkString* name, SkFontStyle* style, bool* isFixedPitch);
 
 protected:
     SkTypeface_FreeType(const SkFontStyle& style, SkFontID uniqueID, bool isFixedPitch)