Eliminate HICON leaks caused by creating icons from bitmap image.

remoting/host/desktop_shape_tracker_win.cc

 // Copyright 2013 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 "remoting/host/desktop_shape_tracker.h"
 
 #include <vector>
 
+#include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/win/scoped_gdi_object.h"
 #include "third_party/webrtc/modules/desktop_capture/desktop_capture_options.h"
 #include "third_party/webrtc/modules/desktop_capture/desktop_region.h"
 
 namespace remoting {
 
 namespace {
 
 struct EnumDesktopShapeData {
@@ skipping 37 matching lines @@
 void DesktopShapeTrackerWin::RefreshDesktopShape() {
   // Accumulate a new desktop shape from current window positions.
   scoped_ptr<EnumDesktopShapeData> shape_data(new EnumDesktopShapeData);
   if (!EnumWindows(EnumWindowsCallback, (LPARAM)shape_data.get())) {
     PLOG(ERROR) << "Failed to enumerate windows";
     desktop_shape_.Clear();
     return;
   }
 
   // If the shape has changed, refresh |desktop_shape_|.
-  if (!EqualRgn(shape_data->desktop_region, old_desktop_region_)) {
-    old_desktop_region_.Set(shape_data->desktop_region.release());
+  if (!EqualRgn(shape_data->desktop_region.get(), old_desktop_region_.get())) {
+    old_desktop_region_ = shape_data->desktop_region.Pass();
 
     // Determine the size of output buffer required to receive the region.
-    DWORD bytes_size = GetRegionData(old_desktop_region_, 0, nullptr);
+    DWORD bytes_size = GetRegionData(old_desktop_region_.get(), 0, nullptr);
     CHECK(bytes_size != 0);
 
     // Fetch the Windows RECTs that comprise the region.
     std::vector<char> buffer(bytes_size);
     LPRGNDATA region_data = reinterpret_cast<LPRGNDATA>(buffer.data());
-    DWORD result = GetRegionData(old_desktop_region_, bytes_size, region_data);
+    DWORD result =
+        GetRegionData(old_desktop_region_.get(), bytes_size, region_data);
     CHECK(result == bytes_size);
     const LPRECT rects = reinterpret_cast<LPRECT>(&region_data->Buffer[0]);
 
     // Reset |desktop_shape_| and add new rectangles into it.
     desktop_shape_.Clear();
     for (size_t i = 0; i < region_data->rdh.nCount; ++i) {
       desktop_shape_.AddRect(webrtc::DesktopRect::MakeLTRB(
           rects[i].left, rects[i].top, rects[i].right, rects[i].bottom));
     }
   }
 }
 
 const webrtc::DesktopRegion& DesktopShapeTrackerWin::desktop_shape() {
   return desktop_shape_;
 }
 
 // static
 BOOL DesktopShapeTrackerWin::EnumWindowsCallback(HWND window, LPARAM lparam) {
   EnumDesktopShapeData* data = reinterpret_cast<EnumDesktopShapeData*>(lparam);
-  HRGN desktop_region = data->desktop_region.Get();
-  HRGN window_region = data->window_region.Get();
+  HRGN desktop_region = data->desktop_region.get();
+  HRGN window_region = data->window_region.get();
 
   // Is the window visible?
   if (!IsWindow(window) || !IsWindowVisible(window) || IsIconic(window))
     return TRUE;
 
   // Find the desktop position of the window (including non-client-area).
   RECT window_rect;
   if (!GetWindowRect(window, &window_rect))
     return TRUE;
 
@@ skipping 24 matching lines @@
 
 } // namespace
 
 // static
 scoped_ptr<DesktopShapeTracker> DesktopShapeTracker::Create(
     webrtc::DesktopCaptureOptions options) {
   return make_scoped_ptr(new DesktopShapeTrackerWin());
 }
 
 }  // namespace remoting