Remove dependency on ConditionVariableWrapper and CriticalSectionWrapper in UdpSocketPosix.

webrtc/test/channel_transport/udp_socket_posix.cc

 /*
  *  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.
  */
 
 #include "webrtc/test/channel_transport/udp_socket_posix.h"
 
 #include <errno.h>
 #include <fcntl.h>
 #include <netdb.h>
 #include <stdio.h>
 #include <string.h>
 #include <sys/ioctl.h>
 #include <sys/types.h>
 #include <time.h>
 #include <unistd.h>
 
 #include "webrtc/system_wrappers/include/trace.h"
 #include "webrtc/test/channel_transport/udp_socket_manager_wrapper.h"
 #include "webrtc/test/channel_transport/udp_socket_wrapper.h"
 
 namespace webrtc {
 namespace test {
 UdpSocketPosix::UdpSocketPosix(const int32_t id, UdpSocketManager* mgr,
-                               bool ipV6Enable) : _id(id)
+                               bool ipV6Enable)
+    : _id(id),
+      _closeBlockingCompletedCond(true, false),
+      _readyForDeletionCond(true, false)
 {
     WEBRTC_TRACE(kTraceMemory, kTraceTransport, id,
                  "UdpSocketPosix::UdpSocketPosix()");
 
     _wantsIncoming = false;
     _mgr = mgr;
 
     _obj = NULL;
     _incomingCb = NULL;
-    _readyForDeletionCond = ConditionVariableWrapper::CreateConditionVariable();
-    _closeBlockingCompletedCond =
-        ConditionVariableWrapper::CreateConditionVariable();
-    _cs = CriticalSectionWrapper::CreateCriticalSection();
     _readyForDeletion = false;
     _closeBlockingActive = false;
-    _closeBlockingCompleted= false;
+    _closeBlockingCompleted = false;
     if(ipV6Enable)
     {
         _socket = socket(AF_INET6, SOCK_DGRAM, IPPROTO_UDP);
     }
     else {
         _socket = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
     }
 
     // Set socket to nonblocking mode.
     int enable_non_blocking = 1;
@@ skipping 11 matching lines @@
     }
 }
 
 UdpSocketPosix::~UdpSocketPosix()
 {
     if(_socket != INVALID_SOCKET)
     {
         close(_socket);
         _socket = INVALID_SOCKET;
     }
-    if(_readyForDeletionCond)
-    {
-        delete _readyForDeletionCond;
-    }
-
-    if(_closeBlockingCompletedCond)
-    {
-        delete _closeBlockingCompletedCond;
-    }
-
-    if(_cs)
-    {
-        delete _cs;
-    }
 }
 
 bool UdpSocketPosix::SetCallback(CallbackObj obj, IncomingSocketCallback cb)
 {
     _obj = obj;
     _incomingCb = cb;
 
     WEBRTC_TRACE(kTraceDebug, kTraceTransport, _id,
                  "UdpSocketPosix(%p)::SetCallback", this);
 
@@ skipping 118 matching lines @@
           _incomingCb(_obj, buf, retval, &from);
         }
         break;
     }
 }
 
 bool UdpSocketPosix::WantsIncoming() { return _wantsIncoming; }
 
 void UdpSocketPosix::CloseBlocking()
 {
-    _cs->Enter();
+    rtc::CritScope lock(&_cs);
     _closeBlockingActive = true;
     if(!CleanUp())
     {
         _closeBlockingActive = false;
-        _cs->Leave();
         return;
     }
 
-    while(!_readyForDeletion)
+    if(!_readyForDeletion)
     {
-        _readyForDeletionCond->SleepCS(*_cs);
+        _cs.Leave();
+        _readyForDeletionCond.Wait(rtc::Event::kForever);
+        _cs.Enter();
     }
     _closeBlockingCompleted = true;
-    _closeBlockingCompletedCond->Wake();
-    _cs->Leave();
+    _closeBlockingCompletedCond.Set();
 }
 
 void UdpSocketPosix::ReadyForDeletion()
 {
-    _cs->Enter();
+    rtc::CritScope lock(&_cs);
     if(!_closeBlockingActive)
     {
-        _cs->Leave();
         return;
     }
+
     close(_socket);
     _socket = INVALID_SOCKET;
     _readyForDeletion = true;
-    _readyForDeletionCond->Wake();
-    while(!_closeBlockingCompleted)
+    _readyForDeletionCond.Set();
+    if(!_closeBlockingCompleted)
     {
-        _closeBlockingCompletedCond->SleepCS(*_cs);
+        _cs.Leave();
+        _closeBlockingCompletedCond.Wait(rtc::Event::kForever);
+        _cs.Enter();
     }
-    _cs->Leave();
 }
 
 bool UdpSocketPosix::CleanUp()
 {
     _wantsIncoming = false;
 
     if (_socket == INVALID_SOCKET)
     {
         return false;
     }
 
     WEBRTC_TRACE(kTraceDebug, kTraceTransport, _id,
                  "calling UdpSocketManager::RemoveSocket()...");
     _mgr->RemoveSocket(this);
     // After this, the socket should may be or will be as deleted. Return
     // immediately.
     return true;
 }
 
 }  // namespace test
 }  // namespace webrtc