Simplify PangoLayout configuration.

ui/gfx/pango_util.h

Index: ui/gfx/pango_util.h
diff --git a/ui/gfx/pango_util.h b/ui/gfx/pango_util.h
index db60c2e6d5890dabff939838800d11309a0fd8f0..49bd814d45be4e5280b53ec179bef94b363d1311 100644
--- a/ui/gfx/pango_util.h
+++ b/ui/gfx/pango_util.h
@@ -7,7 +7,6 @@
 
 #include <cairo/cairo.h>
 #include <pango/pango.h>
-#include <string>
 
 #include "base/i18n/rtl.h"
 #include "base/logging.h"
@@ -19,16 +18,7 @@ typedef struct _PangoContext PangoContext;
 
 namespace gfx {
 
-class Font;
-class PlatformFontPango;
-class Rect;
-
-// Creates and returns a PangoContext. The caller owns the context.
-PangoContext* GetPangoContext();
-
-// Returns the resolution (DPI) used by pango. A negative values means the
-// resolution hasn't been set.
-double GetPangoResolution();
+class FontList;
 
 // Utility class to ensure that PangoFontDescription is freed.
 class ScopedPangoFontDescription {
@@ -55,14 +45,11 @@ class ScopedPangoFontDescription {
 // They are shared with internal skia interfaces.
 // ----------------------------------------------------------------------------
 
-// Setup pango |layout|; set the |text|, the font description based on
-// |font_description|, the |width| in PANGO_SCALE for RTL locale, the base
-// |text_direction|, alignment, ellipsis, word wrapping, resolution, etc.
-void SetupPangoLayoutWithFontDescription(
+// Configures |layout| for the passed-in parameters.
+void SetUpPangoLayout(
     PangoLayout* layout,
     const base::string16& text,
-    const std::string& font_description,
-    int width,
+    const FontList& font_list,
     base::i18n::TextDirection text_direction,
     int flags);