Remove dependency on ConditionVariableWrapper and CriticalSectionWrapper in UdpSocketPosix.

webrtc/test/channel_transport/udp_socket_posix.h

 /*
  *  Copyright (c) 2011 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_SOCKET_POSIX_H_
 #define WEBRTC_TEST_CHANNEL_TRANSPORT_UDP_SOCKET_POSIX_H_
 
 #include <arpa/inet.h>
 #include <netinet/in.h>
 #include <sys/socket.h>
 #include <sys/types.h>
 
-#include "webrtc/system_wrappers/include/condition_variable_wrapper.h"
-#include "webrtc/system_wrappers/include/critical_section_wrapper.h"
+#include "webrtc/base/event.h"
+#include "webrtc/base/criticalsection.h"
 #include "webrtc/test/channel_transport/udp_socket_wrapper.h"
 
 namespace webrtc {
 namespace test {
 
 #define SOCKET_ERROR -1
 
 class UdpSocketPosix : public UdpSocketWrapper
 {
 public:
@@ skipping 40 matching lines @@
     void ReadyForDeletion();
 private:
     friend class UdpSocketManagerPosix;
 
     const int32_t _id;
     IncomingSocketCallback _incomingCb;
     CallbackObj _obj;
 
     SOCKET _socket;
     UdpSocketManager* _mgr;
-    ConditionVariableWrapper* _closeBlockingCompletedCond;
-    ConditionVariableWrapper* _readyForDeletionCond;
+    rtc::Event _closeBlockingCompletedCond;
+    rtc::Event _readyForDeletionCond;
 
     bool _closeBlockingActive;
     bool _closeBlockingCompleted;
     bool _readyForDeletion;
 
-    CriticalSectionWrapper* _cs;
+    rtc::CriticalSection _cs;
 };
 
 }  // namespace test
 }  // namespace webrtc
 
 #endif  // WEBRTC_TEST_CHANNEL_TRANSPORT_UDP_SOCKET_POSIX_H_