Change MessagePumpForGpu and SharedMemory to ScopedHandle

base/message_loop/message_pump_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 "base/message_loop/message_pump_win.h"
 
 #include <math.h>
 #include <stdint.h>
 
 #include <limits>
@@ skipping 492 matching lines @@
   // windows code.   This ScheduleWork() may hurt performance a tiny bit when
   // tasks appear very infrequently, but when the event queue is busy, the
   // kMsgHaveWork events get (percentage wise) rarer and rarer.
   ScheduleWork();
   return ProcessMessageHelper(msg);
 }
 
 //-----------------------------------------------------------------------------
 // MessagePumpForGpu public:
 
-MessagePumpForGpu::MessagePumpForGpu()
-    : event_(CreateEvent(nullptr, FALSE, FALSE, nullptr)) {
+MessagePumpForGpu::MessagePumpForGpu() {
+  event_.Set(CreateEvent(nullptr, FALSE, FALSE, nullptr));
   InitUser32APIs();
 }
 
-MessagePumpForGpu::~MessagePumpForGpu() {
-  CloseHandle(event_);
-}
+MessagePumpForGpu::~MessagePumpForGpu() {}
 
 // static
 void MessagePumpForGpu::InitFactory() {
   bool init_result = MessageLoop::InitMessagePumpForUIFactory(
       &MessagePumpForGpu::CreateMessagePumpForGpu);
   DCHECK(init_result);
 }
 
 // static
 std::unique_ptr<MessagePump> MessagePumpForGpu::CreateMessagePumpForGpu() {
   return WrapUnique<MessagePump>(new MessagePumpForGpu);
 }
 
 void MessagePumpForGpu::ScheduleWork() {
   if (InterlockedExchange(&work_state_, HAVE_WORK) != READY)
     return;  // Someone else continued the pumping.
 
   // TODO(stanisc): crbug.com/596190: Preserve for crash dump analysis.
   // Remove this when the bug is fixed.
   last_set_event_timeticks_ = TimeTicks::Now();
 
   // Make sure the MessagePump does some work for us.
-  SetEvent(event_);
+  SetEvent(event_.Get());
 }
 
 void MessagePumpForGpu::ScheduleDelayedWork(
     const TimeTicks& delayed_work_time) {
   // We know that we can't be blocked right now since this method can only be
   // called on the same thread as Run, so we only need to update our record of
   // how long to sleep when we do sleep.
   delayed_work_time_ = delayed_work_time;
 }
 
 bool MessagePumpForGpu::WasSignaled() {
   // If |event_| was set this would reset it back to unset state.
-  return WaitForSingleObject(event_, 0) == WAIT_OBJECT_0;
+  return WaitForSingleObject(event_.Get(), 0) == WAIT_OBJECT_0;
 }
 
 //-----------------------------------------------------------------------------
 // MessagePumpForGpu private:
 
 void MessagePumpForGpu::DoRunLoop() {
   while (!state_->should_quit) {
     // Indicate that the loop is handling the work.
     // If there is a race condition between switching to WORKING state here and
     // the producer thread setting the HAVE_WORK state after exiting the wait,
@@ skipping 47 matching lines @@
   while ((delay = GetCurrentDelay()) != 0) {
     if (delay < 0)  // Negative value means no timers waiting.
       delay = INFINITE;
 
     // TODO(stanisc): crbug.com/596190: Preserve for crash dump analysis.
     // Remove this when the bug is fixed.
     TimeTicks wait_for_work_timeticks = TimeTicks::Now();
     debug::Alias(&wait_for_work_timeticks);
     debug::Alias(&delay);
 
+    HANDLE handle = event_.Get();
     DWORD result =
-        g_msg_wait_for_multiple_objects_ex(1, &event_, delay, QS_ALLINPUT, 0);
+        g_msg_wait_for_multiple_objects_ex(1, &handle, delay, QS_ALLINPUT, 0);
     DCHECK_NE(WAIT_FAILED, result) << GetLastError();
     if (result != WAIT_TIMEOUT) {
       // Either work or message available.
       return;
     }
   }
 }
 
 bool MessagePumpForGpu::ProcessNextMessage() {
   MSG msg;
@@ skipping 188 matching lines @@
     if (!filter || it->handler == filter) {
       *item = *it;
       completed_io_.erase(it);
       return true;
     }
   }
   return false;
 }
 
 }  // namespace base