Remove use of ConditionVariableWrapper and CriticalSectionWrapper from UdpSocket2Windows.

webrtc/test/channel_transport/udp_socket2_win.h

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 #ifndef WEBRTC_TEST_CHANNEL_TRANSPORT_UDP_SOCKET2_WINDOWS_H_
 #define WEBRTC_TEST_CHANNEL_TRANSPORT_UDP_SOCKET2_WINDOWS_H_
 
 // Disable deprication warning from traffic.h
 #pragma warning(disable : 4995)
 
 // Don't change include order for these header files.
 #include <Winsock2.h>
 #include <Ntddndis.h>
 #include <traffic.h>
 
+#include "webrtc/base/event.h"
 #include "webrtc/system_wrappers/include/atomic32.h"
-#include "webrtc/system_wrappers/include/condition_variable_wrapper.h"
-#include "webrtc/system_wrappers/include/critical_section_wrapper.h"
 #include "webrtc/system_wrappers/include/event_wrapper.h"
 #include "webrtc/system_wrappers/include/rw_lock_wrapper.h"
 #include "webrtc/system_wrappers/include/trace.h"
 #include "webrtc/test/channel_transport/udp_socket2_manager_win.h"
 #include "webrtc/test/channel_transport/udp_socket_wrapper.h"
 
 namespace webrtc {
 namespace test {
 
 class UdpSocket2ManagerWindows;
@@ skipping 91 matching lines @@
     RWLockWrapper* _ptrCbRWLock;
     IncomingSocketCallback _incomingCb;
     CallbackObj _obj;
     bool _qos;
 
     SocketAddress _remoteAddr;
     SOCKET _socket;
     int32_t _iProtocol;
     UdpSocket2ManagerWindows* _mgr;
 
-    CriticalSectionWrapper* _pCrit;
     Atomic32 _outstandingCalls;
     Atomic32 _outstandingCallComplete;
     volatile bool _terminate;
     volatile bool _addedToMgr;
 
-    CriticalSectionWrapper* _ptrDeleteCrit;
-    ConditionVariableWrapper* _ptrDeleteCond;
-    bool _safeTodelete;
+    rtc::Event delete_event_;
 
     RWLockWrapper* _ptrDestRWLock;
     bool _outstandingCallsDisabled;
     bool NewOutstandingCall();
     void OutstandingCallCompleted();
     void DisableNewOutstandingCalls();
-    void WaitForOutstandingCalls();
 
     void RemoveSocketFromManager();
 
     // RWLockWrapper is used as a reference counter for the socket. Write lock
     // is used for creating and deleting socket. Read lock is used for
     // accessing the socket.
     RWLockWrapper* _ptrSocketRWLock;
     bool AquireSocket();
     void ReleaseSocket();
     bool InvalidateSocket();
 
     // Traffic control handles and structure pointers.
     HANDLE _clientHandle;
     HANDLE _flowHandle;
     HANDLE _filterHandle;
     PTC_GEN_FLOW _flow;
     // TrafficControlWindows implements TOS and PCP.
     TrafficControlWindows* _gtc;
     // Holds the current pcp value. Can be -2 or 0 - 7.
     int _pcp;
 
     Atomic32 _receiveBuffers;
 };
 
 }  // namespace test
 }  // namespace webrtc
 
 #endif  // WEBRTC_TEST_CHANNEL_TRANSPORT_UDP_SOCKET2_WINDOWS_H_