Add a ScopedPangoFontDescription helper class and use it.

chrome/browser/ui/gtk/gtk_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 "chrome/browser/ui/gtk/gtk_util.h"
 
 #include <cairo/cairo.h>
 
 #include <algorithm>
 #include <cstdarg>
@@ skipping 27 matching lines @@
 #include "ui/base/gtk/gtk_compat.h"
 #include "ui/base/gtk/gtk_hig_constants.h"
 #include "ui/base/gtk/gtk_screen_util.h"
 #include "ui/base/gtk/menu_label_accelerator_util.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/text/text_elider.h"
 #include "ui/base/x/x11_util.h"
 #include "ui/gfx/image/cairo_cached_surface.h"
 #include "ui/gfx/image/image.h"
+#include "ui/gfx/pango_util.h"
 
 // These conflict with base/tracked_objects.h, so need to come last.
 #include <gdk/gdkx.h>  // NOLINT
 #include <gtk/gtk.h>   // NOLINT
 
 using content::RenderWidgetHost;
 using content::WebContents;
 
 namespace {
 
@@ skipping 437 matching lines @@
       gtk_window_group_add_window(group, *it);
     }
   }
 }
 
 void RemoveAllChildren(GtkWidget* container) {
   gtk_container_foreach(GTK_CONTAINER(container), RemoveWidget, container);
 }
 
 void ForceFontSizePixels(GtkWidget* widget, double size_pixels) {
-  PangoFontDescription* font_desc = pango_font_description_new();
+  gfx::ScopedPangoFontDescription font_desc(pango_font_description_new());
   // pango_font_description_set_absolute_size sets the font size in device
   // units, which for us is pixels.
-  pango_font_description_set_absolute_size(font_desc,
+  pango_font_description_set_absolute_size(font_desc.get(),
                                            PANGO_SCALE * size_pixels);
-  gtk_widget_modify_font(widget, font_desc);
-  pango_font_description_free(font_desc);
+  gtk_widget_modify_font(widget, font_desc.get());
 }
 
 void UndoForceFontSize(GtkWidget* widget) {
   gtk_widget_modify_font(widget, NULL);
 }
 
 gfx::Size GetWidgetSize(GtkWidget* widget) {
   GtkRequisition size;
   gtk_widget_size_request(widget, &size);
   return gfx::Size(size.width, size.height);
@@ skipping 647 matching lines @@
 
 void DoCopy(BrowserWindow* window) {
   DoCutCopyPaste(window, &RenderWidgetHost::Copy, "copy-clipboard");
 }
 
 void DoPaste(BrowserWindow* window) {
   DoCutCopyPaste(window, &RenderWidgetHost::Paste, "paste-clipboard");
 }
 
 }  // namespace gtk_util