fix a memory leak and add a suppression

chrome/browser/ui/gtk/gtk_theme_service.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_theme_service.h"
 
 #include <gtk/gtk.h>
 
 #include <set>
 #include <string>
@@ skipping 228 matching lines @@
                                                                  shift);
   frame_color->pixel = 0;
   frame_color->red = SkColorGetR(shifted) * ui::kSkiaToGDKMultiplier;
   frame_color->green = SkColorGetG(shifted) * ui::kSkiaToGDKMultiplier;
   frame_color->blue = SkColorGetB(shifted) * ui::kSkiaToGDKMultiplier;
 }
 
 }  // namespace
 
 GtkWidget* GtkThemeService::icon_widget_ = NULL;
-gfx::Image* GtkThemeService::default_folder_icon_ = NULL;
-gfx::Image* GtkThemeService::default_bookmark_icon_ = NULL;
+base::LazyInstance<gfx::Image> GtkThemeService::default_folder_icon_ =
+    LAZY_INSTANCE_INITIALIZER;
+base::LazyInstance<gfx::Image> GtkThemeService::default_bookmark_icon_ =
+    LAZY_INSTANCE_INITIALIZER;
 
 // static
 GtkThemeService* GtkThemeService::GetFrom(Profile* profile) {
   return static_cast<GtkThemeService*>(
       ThemeServiceFactory::GetForProfile(profile));
 }
 
 GtkThemeService::GtkThemeService()
     : ThemeService(),
       use_gtk_(false),
@@ skipping 301 matching lines @@
     *thumb_active_color = *theme_thumb_active;
 
   if (theme_thumb_inactive)
     *thumb_inactive_color = *theme_thumb_inactive;
 
   if (theme_trough_color)
     *track_color = *theme_trough_color;
 }
 
 // static
-gfx::Image* GtkThemeService::GetFolderIcon(bool native) {
+gfx::Image GtkThemeService::GetFolderIcon(bool native) {
   if (native) {
     if (!icon_widget_)
       icon_widget_ = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-    // We never release our ref, so we will leak this on program shutdown.
-    if (!default_folder_icon_) {
+
+    if (default_folder_icon_.Get().IsEmpty()) {
+      // This seems to leak.
       GdkPixbuf* pixbuf = gtk_widget_render_icon(
           icon_widget_, GTK_STOCK_DIRECTORY, GTK_ICON_SIZE_MENU, NULL);
-      if (pixbuf)
-        default_folder_icon_ = new gfx::Image(pixbuf);
+      if (pixbuf) {
+        default_folder_icon_.Get() = gfx::Image(pixbuf);
+        g_object_unref(pixbuf);
+      }
     }
-    if (default_folder_icon_)
-      return default_folder_icon_;
+    if (!default_folder_icon_.Get().IsEmpty())
+      return default_folder_icon_.Get();
   }
 
-  return &ui::ResourceBundle::GetSharedInstance().GetNativeImageNamed(
+  return ui::ResourceBundle::GetSharedInstance().GetNativeImageNamed(
       IDR_BOOKMARK_BAR_FOLDER);
 }
 
 // static
-gfx::Image* GtkThemeService::GetDefaultFavicon(bool native) {
+gfx::Image GtkThemeService::GetDefaultFavicon(bool native) {
   if (native) {
     if (!icon_widget_)
       icon_widget_ = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-    // We never release our ref, so we will leak this on program shutdown.
-    if (!default_bookmark_icon_) {
+
+    if (default_bookmark_icon_.Get().IsEmpty()) {
+      // This seems to leak.
       GdkPixbuf* pixbuf = gtk_widget_render_icon(
           icon_widget_, GTK_STOCK_FILE, GTK_ICON_SIZE_MENU, NULL);
-      if (pixbuf)
-        default_bookmark_icon_ = new gfx::Image(pixbuf);
+      if (pixbuf) {
+        default_bookmark_icon_.Get() = gfx::Image(pixbuf);
+        g_object_unref(pixbuf);
+      }
     }
-    if (default_bookmark_icon_)
-      return default_bookmark_icon_;
+    if (!default_bookmark_icon_.Get().IsEmpty())
+      return default_bookmark_icon_.Get();
   }
 
-  return &ui::ResourceBundle::GetSharedInstance().GetNativeImageNamed(
+  return ui::ResourceBundle::GetSharedInstance().GetNativeImageNamed(
       IDR_DEFAULT_FAVICON);
 }
 
 // static
 bool GtkThemeService::DefaultUsesSystemTheme() {
   scoped_ptr<base::Environment> env(base::Environment::Create());
 
   switch (base::nix::GetDesktopEnvironment(env.get())) {
     case base::nix::DESKTOP_ENVIRONMENT_GNOME:
     case base::nix::DESKTOP_ENVIRONMENT_XFCE:
@@ skipping 51 matching lines @@
   }
 }
 
 void GtkThemeService::FreePlatformCaches() {
   ThemeService::FreePlatformCaches();
   STLDeleteValues(&gtk_images_);
 }
 
 void GtkThemeService::OnStyleSet(GtkWidget* widget,
                                  GtkStyle* previous_style) {
-  gfx::Image* default_folder_icon = default_folder_icon_;
-  gfx::Image* default_bookmark_icon = default_bookmark_icon_;
-  default_folder_icon_ = NULL;
-  default_bookmark_icon_ = NULL;
+  default_folder_icon_.Get() = gfx::Image();
+  default_bookmark_icon_.Get() = gfx::Image();
 
   if (profile()->GetPrefs()->GetBoolean(prefs::kUsesSystemTheme)) {
     ClearAllThemeData();
     LoadGtkValues();
     NotifyThemeChanged();
   }
 
   RebuildMenuIconSets();
-
-  // Free the old icons only after the theme change notification has gone
-  // through.
-  if (default_folder_icon)
-    delete default_folder_icon;
-  if (default_bookmark_icon)
-    delete default_bookmark_icon;
 }
 
 void GtkThemeService::LoadGtkValues() {
   // Before we start setting images and values, we have to clear out old, stale
   // values. (If we don't do this, we'll regress startup time in the case where
   // someone installs a heavyweight theme, then goes back to GTK.)
   profile()->GetPrefs()->ClearPref(prefs::kCurrentThemeImages);
 
   GtkStyle* frame_style = gtk_rc_get_style(fake_frame_);
 
@@ skipping 443 matching lines @@
   cairo_new_path(cr);
   cairo_set_line_width(cr, 1.0);
   cairo_move_to(cr, start_x, allocation.y);
   cairo_line_to(cr, start_x, allocation.y + allocation.height);
   cairo_stroke(cr);
   cairo_destroy(cr);
   cairo_pattern_destroy(pattern);
 
   return TRUE;
 }