Add a ScopedPangoFontDescription helper class and use it.

ui/gfx/pango_util.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/pango_util.h"
 
 #include <cairo/cairo.h>
 #include <fontconfig/fontconfig.h>
 #include <pango/pango.h>
 #include <pango/pangocairo.h>
+#include <string>
 
 #include <algorithm>
 #include <map>
 #include <vector>
 
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/platform_font_pango.h"
 #include "ui/gfx/rect.h"
+#include "ui/gfx/skia_util.h"
 
 #if defined(TOOLKIT_GTK)
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
 #include "ui/gfx/gtk_util.h"
 #else
 #include "base/command_line.h"
 #include "ui/base/ui_base_switches.h"
 #endif
 
-#include "ui/gfx/skia_util.h"
-
 namespace {
 
 // Marker for accelerators in the text.
 const gunichar kAcceleratorChar = '&';
 
 // Multiply by the text height to determine how much text should be faded
 // when elliding.
 const double kFadeWidthFactor = 1.5;
 
 // End state of the elliding fade.
@@ skipping 301 matching lines @@
 }
 
 void SetupPangoLayout(PangoLayout* layout,
                       const string16& text,
                       const Font& font,
                       int width,
                       base::i18n::TextDirection text_direction,
                       int flags) {
   SetupPangoLayoutWithoutFont(layout, text, width, text_direction, flags);
 
-  PangoFontDescription* desc = font.GetNativeFont();
-  pango_layout_set_font_description(layout, desc);
-  pango_font_description_free(desc);
+  ScopedPangoFontDescription desc(font.GetNativeFont());
+  pango_layout_set_font_description(layout, desc.get());
 }
 
 void SetupPangoLayoutWithFontDescription(
     PangoLayout* layout,
     const string16& text,
     const std::string& font_description,
     int width,
     base::i18n::TextDirection text_direction,
     int flags) {
   SetupPangoLayoutWithoutFont(layout, text, width, text_direction, flags);
 
-  PangoFontDescription* desc = pango_font_description_from_string(
-      font_description.c_str());
-  pango_layout_set_font_description(layout, desc);
-  pango_font_description_free(desc);
+  ScopedPangoFontDescription desc(
+      pango_font_description_from_string(font_description.c_str()));
+  pango_layout_set_font_description(layout, desc.get());
 }
 
 void AdjustTextRectBasedOnLayout(PangoLayout* layout,
                                  const gfx::Rect& bounds,
                                  int flags,
                                  gfx::Rect* text_rect) {
   int text_width, text_height;
   pango_layout_get_pixel_size(layout, &text_width, &text_height);
   text_rect->set_width(text_width);
   text_rect->set_height(text_height);
@@ skipping 112 matching lines @@
 
   if (i == desc_to_metrics->end()) {
     PangoFontMetrics* metrics = pango_context_get_metrics(context, desc, NULL);
     desc_to_metrics->insert(std::make_pair(desc_hash, metrics));
     return metrics;
   }
   return i->second;
 }
 
 }  // namespace gfx