Eliminate HICON leaks caused by creating icons from bitmap image.

ui/native_theme/native_theme_win.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/native_theme/native_theme_win.h"
 
 #include <windows.h>
 #include <uxtheme.h>
 #include <vsstyle.h>
 #include <vssym32.h>
@@ skipping 862 matching lines @@
                          NULL);
     }
     // There is no way to tell the uxtheme API to draw a left pointing arrow; it
     // doesn't have a flag equivalent to DFCS_MENUARROWRIGHT.  But they are
     // needed for RTL locales on Vista.  So use a memory DC and mirror the
     // region with GDI's StretchBlt.
     gfx::Rect r(rect);
     base::win::ScopedCreateDC mem_dc(CreateCompatibleDC(hdc));
     base::win::ScopedBitmap mem_bitmap(CreateCompatibleBitmap(hdc, r.width(),
                                                               r.height()));
-    base::win::ScopedSelectObject select_bitmap(mem_dc.Get(), mem_bitmap);
+    base::win::ScopedSelectObject select_bitmap(mem_dc.Get(), mem_bitmap.get());
     // Copy and horizontally mirror the background from hdc into mem_dc. Use
     // a negative-width source rect, starting at the rightmost pixel.
     StretchBlt(mem_dc.Get(), 0, 0, r.width(), r.height(),
                hdc, r.right()-1, r.y(), -r.width(), r.height(), SRCCOPY);
     // Draw the arrow.
     RECT theme_rect = {0, 0, r.width(), r.height()};
     HRESULT result = draw_theme_(handle, mem_dc.Get(), MENU_POPUPSUBMENU,
                                   state_id, &theme_rect, NULL);
     // Copy and mirror the result back into mem_dc.
     StretchBlt(hdc, r.x(), r.y(), r.width(), r.height(),
@@ skipping 706 matching lines @@
   // CreateSolidBrush() accepts a RGB value but alpha must be 0.
   base::win::ScopedGDIObject<HBRUSH> bg_brush(CreateSolidBrush(color));
   // DrawThemeBackgroundEx was introduced in XP SP2, so that it's possible
   // draw_theme_ex_ is NULL and draw_theme_ is non-null.
   if (!handle || (!draw_theme_ex_ && (!draw_theme_ || !draw_edges))) {
     // Draw it manually.
     if (draw_edges)
       DrawEdge(hdc, rect, EDGE_SUNKEN, BF_RECT | BF_ADJUST);
 
     if (fill_content_area) {
-      FillRect(hdc, rect, (classic_state & DFCS_INACTIVE) ?
-                   reinterpret_cast<HBRUSH>(COLOR_BTNFACE + 1) : bg_brush);
+      FillRect(hdc, rect, (classic_state & DFCS_INACTIVE)
+                              ? reinterpret_cast<HBRUSH>(COLOR_BTNFACE + 1)
+                              : bg_brush.get());
     }
     return S_OK;
   }
 
   static const DTBGOPTS omit_border_options = {
     sizeof(DTBGOPTS),
     DTBG_OMITBORDER,
     { 0, 0, 0, 0 }
   };
   HRESULT hr = draw_theme_ex_ ?
     draw_theme_ex_(handle, hdc, part_id, state_id, rect,
                    draw_edges ? NULL : &omit_border_options) :
     draw_theme_(handle, hdc, part_id, state_id, rect, NULL);
 
   // TODO(maruel): Need to be fixed if get_theme_content_rect_ is NULL.
   if (fill_content_area && get_theme_content_rect_) {
     RECT content_rect;
     hr = get_theme_content_rect_(handle, hdc, part_id, state_id, rect,
                                   &content_rect);
-    FillRect(hdc, &content_rect, bg_brush);
+    FillRect(hdc, &content_rect, bg_brush.get());
   }
   return hr;
 }
 
 HRESULT NativeThemeWin::PaintScaledTheme(HANDLE theme,
                                          HDC hdc,
                                          int part_id,
                                          int state_id,
                                          const gfx::Rect& rect) const {
   // Correct the scaling and positioning of sub-components such as scrollbar
@@ skipping 333 matching lines @@
   const int width = rect.width();
   const int height = rect.height();
 
   // DrawFrameControl for menu arrow/check wants a monochrome bitmap.
   base::win::ScopedBitmap mask_bitmap(CreateBitmap(width, height, 1, 1, NULL));
 
   if (mask_bitmap == NULL)
     return E_OUTOFMEMORY;
 
   base::win::ScopedCreateDC bitmap_dc(CreateCompatibleDC(NULL));
-  base::win::ScopedSelectObject select_bitmap(bitmap_dc.Get(), mask_bitmap);
+  base::win::ScopedSelectObject select_bitmap(bitmap_dc.Get(),
+                                              mask_bitmap.get());
   RECT local_rect = { 0, 0, width, height };
   DrawFrameControl(bitmap_dc.Get(), &local_rect, type, state);
 
   // We're going to use BitBlt with a b&w mask. This results in using the dest
   // dc's text color for the black bits in the mask, and the dest dc's
   // background color for the white bits in the mask. DrawFrameControl draws the
   // check in black, and the background in white.
   int bg_color_key = COLOR_MENU;
   int text_color_key = COLOR_MENUTEXT;
   switch (control_state) {
@@ skipping 70 matching lines @@
     break;
   case LAST:
     NOTREACHED();
     break;
   }
   theme_handles_[theme_name] = handle;
   return handle;
 }
 
 }  // namespace ui