Replace EventWrapper in video/, test/ and call/.

webrtc/test/rtp_rtcp_observer.h

 /*
  *  Copyright (c) 2013 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_RTP_RTCP_OBSERVER_H_
 #define WEBRTC_TEST_RTP_RTCP_OBSERVER_H_
 
 #include <map>
 #include <vector>
 
 #include "testing/gtest/include/gtest/gtest.h"
 
 #include "webrtc/base/criticalsection.h"
+#include "webrtc/base/event.h"
 #include "webrtc/modules/rtp_rtcp/include/rtp_header_parser.h"
 #include "webrtc/test/constants.h"
 #include "webrtc/test/direct_transport.h"
 #include "webrtc/typedefs.h"
 #include "webrtc/video_send_stream.h"
 
 namespace webrtc {
 namespace test {
 
 class PacketTransport;
 
 class RtpRtcpObserver {
  public:
   enum Action {
     SEND_PACKET,
     DROP_PACKET,
   };
 
   virtual ~RtpRtcpObserver() {}
 
-  virtual EventTypeWrapper Wait() {
-    EventTypeWrapper result = observation_complete_->Wait(timeout_ms_);
-    return result;
-  }
+  virtual bool Wait() { return observation_complete_.Wait(timeout_ms_); }
 
   virtual Action OnSendRtp(const uint8_t* packet, size_t length) {
     return SEND_PACKET;
   }
 
   virtual Action OnSendRtcp(const uint8_t* packet, size_t length) {
     return SEND_PACKET;
   }
 
   virtual Action OnReceiveRtp(const uint8_t* packet, size_t length) {
     return SEND_PACKET;
   }
 
   virtual Action OnReceiveRtcp(const uint8_t* packet, size_t length) {
     return SEND_PACKET;
   }
 
  protected:
-  explicit RtpRtcpObserver(unsigned int event_timeout_ms)
-      : observation_complete_(EventWrapper::Create()),
+  explicit RtpRtcpObserver(int event_timeout_ms)
+      : observation_complete_(false, false),
         parser_(RtpHeaderParser::Create()),
         timeout_ms_(event_timeout_ms) {
     parser_->RegisterRtpHeaderExtension(kRtpExtensionTransmissionTimeOffset,
                                         kTOffsetExtensionId);
     parser_->RegisterRtpHeaderExtension(kRtpExtensionAbsoluteSendTime,
                                         kAbsSendTimeExtensionId);
     parser_->RegisterRtpHeaderExtension(kRtpExtensionTransportSequenceNumber,
                                         kTransportSequenceNumberExtensionId);
   }
 
-  const rtc::scoped_ptr<EventWrapper> observation_complete_;
+  rtc::Event observation_complete_;
   const rtc::scoped_ptr<RtpHeaderParser> parser_;
 
  private:
-  unsigned int timeout_ms_;
+  const int timeout_ms_;
 };
 
 class PacketTransport : public test::DirectTransport {
  public:
   enum TransportType { kReceiver, kSender };
 
   PacketTransport(Call* send_call,
                   RtpRtcpObserver* observer,
                   TransportType transport_type,
                   const FakeNetworkPipe::Config& configuration)
@@ skipping 44 matching lines @@
     return true;  // Will never happen, makes compiler happy.
   }
 
   RtpRtcpObserver* const observer_;
   TransportType transport_type_;
 };
 }  // namespace test
 }  // namespace webrtc
 
 #endif  // WEBRTC_TEST_RTP_RTCP_OBSERVER_H_