Remove ConditionVariableWrapper.

webrtc/system_wrappers/source/condition_variable_event_win.cc

 /*
 Source:
 http://www1.cse.wustl.edu/~schmidt/ACE-copying.html
 
 License:
 Copyright and Licensing Information for ACE(TM), TAO(TM), CIAO(TM), DAnCE(TM),
 and CoSMIC(TM)
 
 ACE(TM), TAO(TM), CIAO(TM), DAnCE>(TM), and CoSMIC(TM) (henceforth referred to
 as "DOC software") are copyrighted by Douglas C. Schmidt and his research
@@ skipping 100 matching lines @@
 }
 
 ConditionVariableEventWin::~ConditionVariableEventWin() {
   CloseHandle(events_[WAKE]);
   CloseHandle(events_[WAKEALL_1]);
   CloseHandle(events_[WAKEALL_0]);
 
   DeleteCriticalSection(&num_waiters_crit_sect_);
 }
 
-void ConditionVariableEventWin::SleepCS(CriticalSectionWrapper& crit_sect) {
+void ConditionVariableEventWin::SleepCS(CRITICAL_SECTION* crit_sect) {
   SleepCS(crit_sect, INFINITE);
 }
 
-bool ConditionVariableEventWin::SleepCS(CriticalSectionWrapper& crit_sect,
+bool ConditionVariableEventWin::SleepCS(CRITICAL_SECTION* crit_sect,
                                         unsigned long max_time_in_ms) {
   EnterCriticalSection(&num_waiters_crit_sect_);
 
   // Get the eventID for the event that will be triggered by next
   // WakeAll() call and start waiting for it.
   const EventWakeUpType eventID =
       (WAKEALL_0 == eventID_) ? WAKEALL_1 : WAKEALL_0;
 
   ++(num_waiters_[eventID]);
   LeaveCriticalSection(&num_waiters_crit_sect_);
 
-  LeaveCriticalSection(&crit_sect.crit_);
+  LeaveCriticalSection(crit_sect);
   HANDLE events[2];
   events[0] = events_[WAKE];
   events[1] = events_[eventID];
   const DWORD result = WaitForMultipleObjects(2,  // Wait on 2 events.
                                               events,
                                               FALSE,  // Wait for either.
                                               max_time_in_ms);
 
   const bool ret_val = (result != WAIT_TIMEOUT);
 
   EnterCriticalSection(&num_waiters_crit_sect_);
   --(num_waiters_[eventID]);
 
   // Last waiter should only be true for WakeAll(). WakeAll() correspond
   // to position 1 in events[] -> (result == WAIT_OBJECT_0 + 1)
   const bool last_waiter = (result == WAIT_OBJECT_0 + 1) &&
       (num_waiters_[eventID] == 0);
   LeaveCriticalSection(&num_waiters_crit_sect_);
 
   if (last_waiter) {
     // Reset/unset the WakeAll() event since all threads have been
     // released.
     ResetEvent(events_[eventID]);
   }
 
-  EnterCriticalSection(&crit_sect.crit_);
+  EnterCriticalSection(crit_sect);
   return ret_val;
 }
 
 void ConditionVariableEventWin::Wake() {
   EnterCriticalSection(&num_waiters_crit_sect_);
   const bool have_waiters = (num_waiters_[WAKEALL_0] > 0) ||
       (num_waiters_[WAKEALL_1] > 0);
   LeaveCriticalSection(&num_waiters_crit_sect_);
 
   if (have_waiters) {
@@ skipping 11 matching lines @@
   const EventWakeUpType eventID = eventID_;
   const bool have_waiters = num_waiters_[eventID] > 0;
   LeaveCriticalSection(&num_waiters_crit_sect_);
 
   if (have_waiters) {
     SetEvent(events_[eventID]);
   }
 }
 
 }  // namespace webrtc