Remove SK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER.

src/fonts/SkFontMgr_indirect.cpp

Index: src/fonts/SkFontMgr_indirect.cpp
diff --git a/src/fonts/SkFontMgr_indirect.cpp b/src/fonts/SkFontMgr_indirect.cpp
index c9d30259c50138b43fba2c77119a4813363467e8..39270b4a4b09c8ad162562bcfa794f3280b30470 100644
--- a/src/fonts/SkFontMgr_indirect.cpp
+++ b/src/fonts/SkFontMgr_indirect.cpp
@@ -245,7 +245,6 @@ SkTypeface* SkFontMgr_Indirect::onMatchFamilyStyle(const char familyName[],
     return this->createTypefaceFromFontId(id);
 }
 
-#ifdef SK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER
 SkTypeface* SkFontMgr_Indirect::onMatchFamilyStyleCharacter(const char familyName[],
                                                             const SkFontStyle& style,
                                                             const char* bcp47[],
@@ -255,15 +254,6 @@ SkTypeface* SkFontMgr_Indirect::onMatchFamilyStyleCharacter(const char familyNam
                                                         bcp47Count, character);
     return this->createTypefaceFromFontId(id);
 }
-#else
-SkTypeface* SkFontMgr_Indirect::onMatchFamilyStyleCharacter(const char familyName[],
-                                                            const SkFontStyle& style,
-                                                            const char bcp47[],
-                                                            SkUnichar character) const {
-    SkFontIdentity id = fProxy->matchNameStyleCharacter(familyName, style, bcp47, character);
-    return this->createTypefaceFromFontId(id);
-}
-#endif
 
 SkTypeface* SkFontMgr_Indirect::onMatchFaceStyle(const SkTypeface* familyMember,
                                                  const SkFontStyle& fontStyle) const {