Use ScopedHandle for the private members of WaitableEvent.

base/synchronization/waitable_event.h

 // 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.
 
 #ifndef BASE_SYNCHRONIZATION_WAITABLE_EVENT_H_
 #define BASE_SYNCHRONIZATION_WAITABLE_EVENT_H_
 
 #include "base/base_export.h"
 #include "base/basictypes.h"
 
 #if defined(OS_WIN)
-#include <windows.h>
+#include "base/win/scoped_handle.h"
 #endif
 
 #if defined(OS_POSIX)
 #include <list>
 #include <utility>
 #include "base/memory/ref_counted.h"
 #include "base/synchronization/lock.h"
 #endif
 
 namespace base {
@@ skipping 23 matching lines @@
   // If manual_reset is true, then to set the event state to non-signaled, a
   // consumer must call the Reset method.  If this parameter is false, then the
   // system automatically resets the event state to non-signaled after a single
   // waiting thread has been released.
   WaitableEvent(bool manual_reset, bool initially_signaled);
 
 #if defined(OS_WIN)
   // Create a WaitableEvent from an Event HANDLE which has already been
   // created. This objects takes ownership of the HANDLE and will close it when
   // deleted.
+  // TODO(rvargas): Pass ScopedHandle instead (and on Release).
   explicit WaitableEvent(HANDLE event_handle);
 
   // Releases ownership of the handle from this object.
   HANDLE Release();
 #endif
 
   ~WaitableEvent();
 
   // Put the event in the un-signaled state.
   void Reset();
@@ skipping 17 matching lines @@
   void Wait();
 
   // Wait up until max_time has passed for the event to be signaled.  Returns
   // true if the event was signaled.  If this method returns false, then it
   // does not necessarily mean that max_time was exceeded.
   //
   // TimedWait can synchronise its own destruction like |Wait|.
   bool TimedWait(const TimeDelta& max_time);
 
 #if defined(OS_WIN)
-  HANDLE handle() const { return handle_; }
+  HANDLE handle() const { return handle_.Get(); }
 #endif
 
   // Wait, synchronously, on multiple events.
   //   waitables: an array of WaitableEvent pointers
   //   count: the number of elements in @waitables
   //
   // returns: the index of a WaitableEvent which has been signaled.
   //
   // You MUST NOT delete any of the WaitableEvent objects while this wait is
   // happening, however WaitMany's return "happens after" the |Signal| call
@@ skipping 29 matching lines @@
     virtual bool Compare(void* tag) = 0;
 
    protected:
     virtual ~Waiter() {}
   };
 
  private:
   friend class WaitableEventWatcher;
 
 #if defined(OS_WIN)
-  HANDLE handle_;
+  win::ScopedHandle handle_;
 #else
   // On Windows, one can close a HANDLE which is currently being waited on. The
   // MSDN documentation says that the resulting behaviour is 'undefined', but
   // it doesn't crash. However, if we were to include the following members
   // directly then, on POSIX, one couldn't use WaitableEventWatcher to watch an
   // event which gets deleted. This mismatch has bitten us several times now,
   // so we have a kernel of the WaitableEvent, which is reference counted.
   // WaitableEventWatchers may then take a reference and thus match the Windows
   // behaviour.
   struct WaitableEventKernel :
@@ skipping 29 matching lines @@
 
   scoped_refptr<WaitableEventKernel> kernel_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(WaitableEvent);
 };
 
 }  // namespace base
 
 #endif  // BASE_SYNCHRONIZATION_WAITABLE_EVENT_H_