Simplify PangoLayout configuration.

ui/gfx/render_text_pango.cc

 // 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.
 
 #include "ui/gfx/render_text_pango.h"
 
 #include <pango/pangocairo.h>
 #include <algorithm>
 #include <string>
 #include <vector>
@@ skipping 289 matching lines @@
         cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 0, 0);
     CHECK_EQ(CAIRO_STATUS_SUCCESS, cairo_surface_status(surface));
     cairo_t* cr = cairo_create(surface);
     CHECK_EQ(CAIRO_STATUS_SUCCESS, cairo_status(cr));
 
     layout_ = pango_cairo_create_layout(cr);
     CHECK_NE(static_cast<PangoLayout*>(NULL), layout_);
     cairo_destroy(cr);
     cairo_surface_destroy(surface);
 
-    SetupPangoLayoutWithFontDescription(layout_,
-                                        GetLayoutText(),
-                                        font_list().GetFontDescriptionString(),
-                                        0,
-                                        GetTextDirection(),
-                                        Canvas::DefaultCanvasTextAlignment());
+    SetUpPangoLayout(layout_, GetLayoutText(), font_list(), GetTextDirection(),
+                     Canvas::DefaultCanvasTextAlignment());
 
     // No width set so that the x-axis position is relative to the start of the
     // text. ToViewPoint and ToTextPoint take care of the position conversion
     // between text space and view spaces.
     pango_layout_set_width(layout_, -1);
     // TODO(xji): If RenderText will be used for displaying purpose, such as
     // label, we will need to remove the single-line-mode setting.
     pango_layout_set_single_paragraph_mode(layout_, true);
 
     layout_text_ = pango_layout_get_text(layout_);
@@ skipping 193 matching lines @@
                                           int glyph_index) const {
   return LayoutIndexToTextIndex(run->item->offset +
                                 run->glyphs->log_clusters[glyph_index]);
 }
 
 RenderText* RenderText::CreateNativeInstance() {
   return new RenderTextPango;
 }
 
 }  // namespace gfx