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

webrtc/test/rtp_rtcp_observer.h

Index: webrtc/test/rtp_rtcp_observer.h
diff --git a/webrtc/test/rtp_rtcp_observer.h b/webrtc/test/rtp_rtcp_observer.h
index c7e463e1641615957b51323250f3e58c96a838e3..95c33c9a2ad913619d3b8d9c9cbe49d278a83b28 100644
--- a/webrtc/test/rtp_rtcp_observer.h
+++ b/webrtc/test/rtp_rtcp_observer.h
@@ -16,6 +16,7 @@
 #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"
@@ -36,10 +37,7 @@ class RtpRtcpObserver {
 
   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;
@@ -58,8 +56,8 @@ class RtpRtcpObserver {
   }
 
  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,
@@ -70,11 +68,11 @@ class RtpRtcpObserver {
                                         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 {