1 files changed, 3 insertions, 6 deletions
diff --git a/gm/fontmgr.cpp b/gm/fontmgr.cpp
index 9708d19978..b604175b0f 100644
--- a/gm/fontmgr.cpp
+++ b/gm/fontmgr.cpp
@@ -65,8 +65,7 @@ public:
         } else {
             fFM = SkFontMgr::RefDefault();
         }
-        fName.append(sk_tool_utils::platform_os_name());
-        fName.append(sk_tool_utils::platform_extra_config("GDI"));
+        fName.append(sk_tool_utils::platform_font_manager());
     }
 
 protected:
@@ -134,8 +133,7 @@ public:
 protected:
     SkString onShortName() override {
         SkString name("fontmgr_match");
-        name.append(sk_tool_utils::platform_os_name());
-        name.append(sk_tool_utils::platform_extra_config("GDI"));
+        name.append(sk_tool_utils::platform_font_manager());
         return name;
     }
 
@@ -223,8 +221,7 @@ public:
         if (scale != 1 || skew != 0) {
             fName.appendf("_%g_%g", scale, skew);
         }
-        fName.append(sk_tool_utils::platform_os_name());
-        fName.append(sk_tool_utils::platform_extra_config("GDI"));
+        fName.append(sk_tool_utils::platform_font_manager());
         fFM = SkFontMgr::RefDefault();
     }