Fix memory leak in ImageButton exposed by r20028.

views/controls/button/image_button.cc

 // Copyright (c) 2006-2008 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 "views/controls/button/image_button.h"
 
 #include "app/gfx/canvas.h"
 #include "app/throb_animation.h"
 #include "skia/ext/image_operations.h"
 
@@ skipping 20 matching lines @@
 }
 
 void ImageButton::SetImage(ButtonState aState, SkBitmap* anImage) {
   images_[aState] = anImage ? *anImage : SkBitmap();
 }
 
 void ImageButton::SetBackground(SkColor color,
                                 SkBitmap* image,
                                 SkBitmap* mask) {
   if (!color && !image)
-    background_image_ = NULL;
+    background_image_.reset(NULL);
 
-  background_image_ = new SkBitmap(
-      skia::ImageOperations::CreateButtonBackground(color, *image, *mask));
+  background_image_.reset(new SkBitmap(
+      skia::ImageOperations::CreateButtonBackground(color, *image, *mask)));
 }
 
 void ImageButton::SetImageAlignment(HorizontalAlignment h_align,
                                     VerticalAlignment v_align) {
   h_alignment_ = h_align;
   v_alignment_ = v_align;
   SchedulePaint();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ skipping 17 matching lines @@
     if (h_alignment_ == ALIGN_CENTER)
       x = (width() - img.width()) / 2;
     else if (h_alignment_ == ALIGN_RIGHT)
       x = width() - img.width();
 
     if (v_alignment_ == ALIGN_MIDDLE)
       y = (height() - img.height()) / 2;
     else if (v_alignment_ == ALIGN_BOTTOM)
       y = height() - img.height();
 
-    if (background_image_)
-      canvas->DrawBitmapInt(*background_image_, x, y);
+    if (background_image_.get())
+      canvas->DrawBitmapInt(*(background_image_.get()), x, y);
     canvas->DrawBitmapInt(img, x, y);
   }
   PaintFocusBorder(canvas);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ImageButton, protected:
 
 SkBitmap ImageButton::GetImageToPaint() {
   SkBitmap img;
@@ skipping 64 matching lines @@
 
 bool ToggleImageButton::GetTooltipText(int x, int y, std::wstring* tooltip) {
   if (!toggled_ || toggled_tooltip_text_.empty())
     return Button::GetTooltipText(x, y, tooltip);
 
   *tooltip = toggled_tooltip_text_;
   return true;
 }
 
 }  // namespace views