Remove SK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER.

src/ports/SkRemotableFontMgr_win_dw.cpp

Index: src/ports/SkRemotableFontMgr_win_dw.cpp
diff --git a/src/ports/SkRemotableFontMgr_win_dw.cpp b/src/ports/SkRemotableFontMgr_win_dw.cpp
index 498f21f01296f9ea2ee69a5ebc3389d8fc6dfdd3..2f02e4bcaa062a2a8dd4ff56bc48ea366427c4a3 100644
--- a/src/ports/SkRemotableFontMgr_win_dw.cpp
+++ b/src/ports/SkRemotableFontMgr_win_dw.cpp
@@ -408,21 +408,11 @@ public:
         SkFontIdentity fIdentity;
     };
 
-#ifdef SK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER
     virtual SkFontIdentity matchNameStyleCharacter(const char familyName[],
                                                    const SkFontStyle& pattern,
                                                    const char* bcp47[], int bcp47Count,
                                                    SkUnichar character) const SK_OVERRIDE
     {
-#else
-    virtual SkFontIdentity matchNameStyleCharacter(const char familyName[],
-                                                   const SkFontStyle& pattern,
-                                                   const char bcp47_val[],
-                                                   SkUnichar character) const SK_OVERRIDE
-    {
-        const char** bcp47 = &bcp47_val;
-        int bcp47Count = bcp47_val ? 1 : 0;
-#endif
         SkFontIdentity identity = { SkFontIdentity::kInvalidDataId };
 
         IDWriteFactory* dwFactory = sk_get_dwrite_factory();