Make SkAdvancedTypefaceMetrics private.

src/fonts/SkTestScalerContext.h

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkTestScalerContext_DEFINED
 #define SkTestScalerContext_DEFINED
 
@@ skipping 51 matching lines @@
         SkSafeUnref(fTestFont);
     }
     void getAdvance(SkGlyph* glyph);
     void getFontMetrics(SkPaint::FontMetrics* metrics);
     void getMetrics(SkGlyph* glyph);
     void getPath(const SkGlyph& glyph, SkPath* path);
 protected:
     SkScalerContext* onCreateScalerContext(const SkDescriptor* desc) const override;
     void onFilterRec(SkScalerContextRec* rec) const override;
     SkAdvancedTypefaceMetrics* onGetAdvancedTypefaceMetrics(
-        SkAdvancedTypefaceMetrics::PerGlyphInfo,
+        PerGlyphInfo,
         const uint32_t* glyphIDs,
         uint32_t glyphIDsCount) const override;
 
     SkStreamAsset* onOpenStream(int* ttcIndex) const override {
         SkASSERT(0);  // don't expect to get here
         return NULL;
     }
 
     void onGetFontDescriptor(SkFontDescriptor* desc, bool* isLocal) const override;
 
@@ skipping 21 matching lines @@
         return 0;
     }
 private:
     SkTestFont* fTestFont;
     friend class SkTestScalerContext;
 };
 
 SkTypeface* CreateTestTypeface(const char* name, SkTypeface::Style style);
 
 #endif