Remove GrFontScaler class

src/gpu/text/GrTextUtils.h

Index: src/gpu/text/GrTextUtils.h
diff --git a/src/gpu/text/GrTextUtils.h b/src/gpu/text/GrTextUtils.h
index 7823473f771d09ee977e88a4e0605b246e46bf5a..c218ab7da19768288265e91fcc461a289244cfac 100644
--- a/src/gpu/text/GrTextUtils.h
+++ b/src/gpu/text/GrTextUtils.h
@@ -18,7 +18,6 @@ class GrBatchTextStrike;
 class GrClip;
 class GrContext;
 class GrDrawContext;
-class GrFontScaler;
 class GrShaderCaps;
 class SkGlyph;
 class SkMatrix;
@@ -85,7 +84,6 @@ public:
 
     static bool ShouldDisableLCD(const SkPaint& paint);
 
-    static GrFontScaler* GetGrFontScaler(SkGlyphCache* cache);
     static uint32_t FilterTextFlags(const SkSurfaceProps& surfaceProps, const SkPaint& paint);
 
 private:
@@ -96,12 +94,12 @@ private:
 
     static void BmpAppendGlyph(GrAtlasTextBlob*, int runIndex, GrBatchFontCache*,
                                GrBatchTextStrike**, const SkGlyph&, int left, int top,
-                               GrColor color, GrFontScaler*);
+                               GrColor color, SkGlyphCache*);
 
     static bool DfAppendGlyph(GrAtlasTextBlob*, int runIndex, GrBatchFontCache*,
                               GrBatchTextStrike**, const SkGlyph&,
                               SkScalar sx, SkScalar sy, GrColor color,
-                              GrFontScaler* scaler,
+                              SkGlyphCache* cache,
                               SkScalar textRatio, const SkMatrix& viewMatrix);
 };