Enables font-related unittests again.

ui/gfx/platform_font_pango.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef UI_GFX_PLATFORM_FONT_PANGO_H_
 #define UI_GFX_PLATFORM_FONT_PANGO_H_
 
 #include <string>
 
 #include "base/compiler_specific.h"
@@ skipping 37 matching lines @@
   // Overridden from PlatformFont:
   virtual Font DeriveFont(int size_delta, int style) const OVERRIDE;
   virtual int GetHeight() const OVERRIDE;
   virtual int GetBaseline() const OVERRIDE;
   virtual int GetCapHeight() const OVERRIDE;
   virtual int GetAverageCharacterWidth() const OVERRIDE;
   virtual int GetStringWidth(const base::string16& text) const OVERRIDE;
   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;
 
  private:
   // Create a new instance of this object with the specified properties. Called
   // from DeriveFont.
   PlatformFontPango(const skia::RefPtr<SkTypeface>& typeface,
                     const std::string& name,
                     int size,
                     int style);
   virtual ~PlatformFontPango();
 
   // Returns a Pango font description (suitable for parsing by
   // pango_font_description_from_string()) for the default UI font.
   static std::string GetDefaultFont();
 
   // Initialize this object.
   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);
 
   // Potentially slow call to get pango metrics (average width, underline info).
   void InitPangoMetrics();
 
   // Setup a Skia context to use the current typeface.
   void PaintSetup(SkPaint* paint) const;
 
   // Make |this| a copy of |other|.
@@ skipping 27 matching lines @@
 #if defined(OS_CHROMEOS)
   static std::string* default_font_description_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(PlatformFontPango);
 };
 
 }  // namespace gfx
 
 #endif  // UI_GFX_PLATFORM_FONT_PANGO_H_