Add a ScopedPangoFontDescription helper class and use it.

ui/gfx/platform_font_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/platform_font_pango.h"
 
 #include <fontconfig/fontconfig.h>
 #include <pango/pango.h>
 
 #include <algorithm>
@@ skipping 80 matching lines @@
 
 Font* PlatformFontPango::default_font_ = NULL;
 
 ////////////////////////////////////////////////////////////////////////////////
 // PlatformFontPango, public:
 
 PlatformFontPango::PlatformFontPango() {
   if (default_font_ == NULL) {
     std::string font_name = GetDefaultFont();
 
-    PangoFontDescription* desc =
-        pango_font_description_from_string(font_name.c_str());
-    default_font_ = new Font(desc);
-    pango_font_description_free(desc);
+    ScopedPangoFontDescription desc(
+        pango_font_description_from_string(font_name.c_str()));
+    default_font_ = new Font(desc.get());
 
     DCHECK(default_font_);
   }
 
   InitFromPlatformFont(
       static_cast<PlatformFontPango*>(default_font_->platform_font()));
 }
 
 PlatformFontPango::PlatformFontPango(NativeFont native_font) {
   std::vector<std::string> family_names;
@@ skipping 218 matching lines @@
   paint->setTextSize(font_size_pixels_);
   paint->setTypeface(typeface_);
   paint->setFakeBoldText((gfx::Font::BOLD & style_) && !typeface_->isBold());
   paint->setTextSkewX((gfx::Font::ITALIC & style_) && !typeface_->isItalic() ?
                       -SK_Scalar1/4 : 0);
 }
 
 void PlatformFontPango::InitPangoMetrics() {
   if (!pango_metrics_inited_) {
     pango_metrics_inited_ = true;
-    PangoFontDescription* pango_desc = GetNativeFont();
-    PangoFontMetrics* pango_metrics = GetPangoFontMetrics(pango_desc);
+    ScopedPangoFontDescription pango_desc(GetNativeFont());
+    PangoFontMetrics* pango_metrics = GetPangoFontMetrics(pango_desc.get());
 
     underline_position_pixels_ =
         pango_font_metrics_get_underline_position(pango_metrics) /
         PANGO_SCALE;
 
     // TODO(davemoore): Come up with a better solution.
     // This is a hack, but without doing this the underlines
     // we get end up fuzzy. So we align to the midpoint of a pixel.
     underline_position_pixels_ /= 2;
 
     underline_thickness_pixels_ =
         pango_font_metrics_get_underline_thickness(pango_metrics) /
         PANGO_SCALE;
 
     // First get the Pango-based width (converting from Pango units to pixels).
     const double pango_width_pixels =
         pango_font_metrics_get_approximate_char_width(pango_metrics) /
         PANGO_SCALE;
 
     // Yes, this is how Microsoft recommends calculating the dialog unit
     // conversions.
     const int text_width_pixels = GetStringWidth(
         ASCIIToUTF16("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"));
     const double dialog_units_pixels = (text_width_pixels / 26 + 1) / 2;
     average_width_pixels_ = std::min(pango_width_pixels, dialog_units_pixels);
-    pango_font_description_free(pango_desc);
   }
 }
 
 
 double PlatformFontPango::GetAverageWidth() const {
   const_cast<PlatformFontPango*>(this)->InitPangoMetrics();
   return average_width_pixels_;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // PlatformFont, public:
 
 // static
 PlatformFont* PlatformFont::CreateDefault() {
   return new PlatformFontPango;
 }
 
 // static
 PlatformFont* PlatformFont::CreateFromNativeFont(NativeFont native_font) {
   return new PlatformFontPango(native_font);
 }
 
 // static
 PlatformFont* PlatformFont::CreateFromNameAndSize(const std::string& font_name,
                                                   int font_size) {
   return new PlatformFontPango(font_name, font_size);
 }
 
 }  // namespace gfx