Eliminate HICON leaks caused by creating icons from bitmap image.

base/win/scoped_gdi_object.h

 // Copyright (c) 2010 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.
 
 #ifndef BASE_WIN_SCOPED_GDI_OBJECT_H_
 #define BASE_WIN_SCOPED_GDI_OBJECT_H_
 
 #include <windows.h>
 
 #include "base/basictypes.h"
 #include "base/logging.h"
+#include "base/move.h"
 
 namespace base {
 namespace win {
 
 // Like ScopedHandle but for GDI objects.
 template<class T>
 class ScopedGDIObject {
+  MOVE_ONLY_TYPE_WITH_MOVE_CONSTRUCTOR_FOR_CPP_03(ScopedGDIObject)
+
  public:
+  // Constructor that defaults to initializing with NULL.
   ScopedGDIObject() : object_(NULL) {}
+
+  // Constructor that takes ownership of an object.

[sky, 2015/11/03 17:23:15]

This comment is useful as it clearly documents ownership. The other comments you
are adding are obvious from the context and I wouldn't bother adding them.

   explicit ScopedGDIObject(T object) : object_(object) {}
 
+  // Constructor that allows construction from an rvalue.
+  ScopedGDIObject(ScopedGDIObject&& other) : object_(NULL) {

[sky, 2015/11/03 17:23:14]

If you can, make these nullptr.

+    Set(other.release());
+  }
+
   ~ScopedGDIObject() {
     Close();
   }
 
   T Get() {
     return object_;
   }
 
   void Set(T object) {
     if (object_ && object != object_)
       Close();
     object_ = object;
   }
 
+  // operator= that takes ownership of an object.
   ScopedGDIObject& operator=(T object) {
     Set(object);
     return *this;
   }
 
+  // operator= that allows assignment from an rvalue.
+  ScopedGDIObject& operator=(ScopedGDIObject&& rhs) {
+    Set(rhs.release());
+    return *this;
+  }
+
   T release() {
     T object = object_;
     object_ = NULL;
     return object;
   }
 
   operator T() { return object_; }
 
  private:
   void Close() {
     if (object_)
       DeleteObject(object_);
   }
 
   T object_;
-  DISALLOW_COPY_AND_ASSIGN(ScopedGDIObject);
 };
 
 // An explicit specialization for HICON because we have to call DestroyIcon()
 // instead of DeleteObject() for HICON.
 template<>
 void inline ScopedGDIObject<HICON>::Close() {
   if (object_)
     DestroyIcon(object_);
 }
 
 // Typedefs for some common use cases.
 typedef ScopedGDIObject<HBITMAP> ScopedBitmap;
 typedef ScopedGDIObject<HRGN> ScopedRegion;
 typedef ScopedGDIObject<HFONT> ScopedHFONT;
 typedef ScopedGDIObject<HICON> ScopedHICON;
 
 }  // namespace win
 }  // namespace base
 
 #endif  // BASE_WIN_SCOPED_GDI_OBJECT_H_