Eliminate HICON leaks caused by creating icons from bitmap image.

chrome/browser/ui/views/status_icons/status_icon_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 "chrome/browser/ui/views/status_icons/status_icon_win.h"
 
 #include "base/strings/string_number_conversions.h"
 #include "base/win/windows_version.h"
 #include "chrome/browser/ui/views/status_icons/status_tray_win.h"
 #include "third_party/skia/include/core/SkBitmap.h"
@@ skipping 64 matching lines @@
 }
 
 void StatusIconWin::ResetIcon() {
   NOTIFYICONDATA icon_data;
   InitIconData(&icon_data);
   // Delete any previously existing icon.
   Shell_NotifyIcon(NIM_DELETE, &icon_data);
   InitIconData(&icon_data);
   icon_data.uFlags = NIF_MESSAGE;
   icon_data.uCallbackMessage = message_id_;
-  icon_data.hIcon = icon_.Get();
+  icon_data.hIcon = icon_.get();
   // If we have an image, then set the NIF_ICON flag, which tells
   // Shell_NotifyIcon() to set the image for the status icon it creates.
   if (icon_data.hIcon)
     icon_data.uFlags |= NIF_ICON;
   // Re-add our icon.
   BOOL result = Shell_NotifyIcon(NIM_ADD, &icon_data);
   if (!result)
     LOG(WARNING) << "Unable to re-create status tray icon.";
 }
 
 void StatusIconWin::SetImage(const gfx::ImageSkia& image) {
   // Create the icon.
   NOTIFYICONDATA icon_data;
   InitIconData(&icon_data);
   icon_data.uFlags = NIF_ICON;
-  icon_.Set(IconUtil::CreateHICONFromSkBitmap(*image.bitmap()));
-  icon_data.hIcon = icon_.Get();
+  icon_ = IconUtil::CreateHICONFromSkBitmap(*image.bitmap()).Pass();
+  icon_data.hIcon = icon_.get();
   BOOL result = Shell_NotifyIcon(NIM_MODIFY, &icon_data);
   if (!result)
     LOG(WARNING) << "Error setting status tray icon image";
 }
 
 void StatusIconWin::SetToolTip(const base::string16& tool_tip) {
   // Create the icon.
   NOTIFYICONDATA icon_data;
   InitIconData(&icon_data);
   icon_data.uFlags = NIF_TIP;
@@ skipping 11 matching lines @@
   NOTIFYICONDATA icon_data;
   InitIconData(&icon_data);
   icon_data.uFlags = NIF_INFO;
   icon_data.dwInfoFlags = NIIF_INFO;
   wcscpy_s(icon_data.szInfoTitle, title.c_str());
   wcscpy_s(icon_data.szInfo, contents.c_str());
   icon_data.uTimeout = 0;
 
   base::win::Version win_version = base::win::GetVersion();
   if (!icon.isNull() && win_version != base::win::VERSION_PRE_XP) {
-    balloon_icon_.Set(IconUtil::CreateHICONFromSkBitmap(*icon.bitmap()));
+    balloon_icon_ = IconUtil::CreateHICONFromSkBitmap(*icon.bitmap()).Pass();
     if (win_version >= base::win::VERSION_VISTA) {
-      icon_data.hBalloonIcon = balloon_icon_.Get();
+      icon_data.hBalloonIcon = balloon_icon_.get();
       icon_data.dwInfoFlags = NIIF_USER | NIIF_LARGE_ICON;
     } else {
-      icon_data.hIcon = balloon_icon_.Get();
+      icon_data.hIcon = balloon_icon_.get();
       icon_data.uFlags |= NIF_ICON;
       icon_data.dwInfoFlags = NIIF_USER;
     }
   }
 
   BOOL result = Shell_NotifyIcon(NIM_MODIFY, &icon_data);
   if (!result)
     LOG(WARNING) << "Unable to create status tray balloon.";
 }
 
@@ skipping 17 matching lines @@
     memset(icon_data, 0, sizeof(NOTIFYICONDATA));
     icon_data->cbSize = sizeof(NOTIFYICONDATA);
   } else {
     memset(icon_data, 0, NOTIFYICONDATA_V3_SIZE);
     icon_data->cbSize = NOTIFYICONDATA_V3_SIZE;
   }
 
   icon_data->hWnd = window_;
   icon_data->uID = icon_id_;
 }