Enables font-related unittests again.

ui/gfx/platform_font_pango.h

Index: ui/gfx/platform_font_pango.h
diff --git a/ui/gfx/platform_font_pango.h b/ui/gfx/platform_font_pango.h
index 136bf671d4d533cd439bf6cf3a534a3053762994..739a633aa471ce1deddcf47c54909cf32cb9f986 100644
--- a/ui/gfx/platform_font_pango.h
+++ b/ui/gfx/platform_font_pango.h
@@ -55,6 +55,7 @@ class GFX_EXPORT PlatformFontPango : public PlatformFont {
   virtual int GetExpectedTextWidth(int length) const OVERRIDE;
   virtual int GetStyle() const OVERRIDE;
   virtual std::string GetFontName() const OVERRIDE;
+  virtual std::string GetActualFontNameForTesting() const OVERRIDE;
   virtual int GetFontSize() const OVERRIDE;
   virtual NativeFont GetNativeFont() const OVERRIDE;
 
@@ -75,8 +76,8 @@ class GFX_EXPORT PlatformFontPango : public PlatformFont {
   void InitWithNameAndSize(const std::string& font_name, int font_size);
   void InitWithTypefaceNameSizeAndStyle(
       const skia::RefPtr<SkTypeface>& typeface,
-      const std::string& name,
-      int size,
+      const std::string& font_family,
+      int font_size,
       int style);
   void InitFromPlatformFont(const PlatformFontPango* other);