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

webrtc/call/bitrate_estimator_tests.cc

Index: webrtc/call/bitrate_estimator_tests.cc
diff --git a/webrtc/call/bitrate_estimator_tests.cc b/webrtc/call/bitrate_estimator_tests.cc
index 3ce96f614ae13d34006526ea15e605d68aa58069..81d4afd07ba1107ffc2bc872e2e11501c56d5dec 100644
--- a/webrtc/call/bitrate_estimator_tests.cc
+++ b/webrtc/call/bitrate_estimator_tests.cc
@@ -57,12 +57,12 @@ class TraceObserver {
     callback_.PushExpectedLogLine(expected_log_line);
   }
 
-  EventTypeWrapper Wait() { return callback_.Wait(); }
+  bool Wait() { return callback_.Wait(); }
 
  private:
   class Callback : public TraceCallback {
    public:
-    Callback() : done_(EventWrapper::Create()) {}
+    Callback() : done_(false, false) {}
 
     void Print(TraceLevel level, const char* message, int length) override {
       rtc::CritScope lock(&crit_sect_);
@@ -81,15 +81,13 @@ class TraceObserver {
       }
       if (expected_log_lines_.size() <= 0) {
         if (num_popped > 0) {
-          done_->Set();
+          done_.Set();
         }
         return;
       }
     }
 
-    EventTypeWrapper Wait() {
-      return done_->Wait(test::CallTest::kDefaultTimeoutMs);
-    }
+    bool Wait() { return done_.Wait(test::CallTest::kDefaultTimeoutMs); }
 
     void PushExpectedLogLine(const std::string& expected_log_line) {
       rtc::CritScope lock(&crit_sect_);
@@ -101,7 +99,7 @@ class TraceObserver {
     rtc::CriticalSection crit_sect_;
     Strings received_log_lines_ GUARDED_BY(crit_sect_);
     Strings expected_log_lines_ GUARDED_BY(crit_sect_);
-    rtc::scoped_ptr<EventWrapper> done_;
+    rtc::Event done_;
   };
 
   Callback callback_;
@@ -280,7 +278,7 @@ TEST_F(BitrateEstimatorTest, InstantiatesTOFPerDefaultForVideo) {
   receiver_trace_.PushExpectedLogLine(kSingleStreamLog);
   receiver_trace_.PushExpectedLogLine(kSingleStreamLog);
   streams_.push_back(new Stream(this, false));
-  EXPECT_EQ(kEventSignaled, receiver_trace_.Wait());
+  EXPECT_TRUE(receiver_trace_.Wait());
 }
 
 TEST_F(BitrateEstimatorTest, ImmediatelySwitchToASTForAudio) {
@@ -291,7 +289,7 @@ TEST_F(BitrateEstimatorTest, ImmediatelySwitchToASTForAudio) {
   receiver_trace_.PushExpectedLogLine("Switching to absolute send time RBE.");
   receiver_trace_.PushExpectedLogLine(kAbsSendTimeLog);
   streams_.push_back(new Stream(this, true));
-  EXPECT_EQ(kEventSignaled, receiver_trace_.Wait());
+  EXPECT_TRUE(receiver_trace_.Wait());
 }
 
 TEST_F(BitrateEstimatorTest, ImmediatelySwitchToASTForVideo) {
@@ -302,21 +300,21 @@ TEST_F(BitrateEstimatorTest, ImmediatelySwitchToASTForVideo) {
   receiver_trace_.PushExpectedLogLine("Switching to absolute send time RBE.");
   receiver_trace_.PushExpectedLogLine(kAbsSendTimeLog);
   streams_.push_back(new Stream(this, false));
-  EXPECT_EQ(kEventSignaled, receiver_trace_.Wait());
+  EXPECT_TRUE(receiver_trace_.Wait());
 }
 
 TEST_F(BitrateEstimatorTest, SwitchesToASTForAudio) {
   receiver_trace_.PushExpectedLogLine(kSingleStreamLog);
   receiver_trace_.PushExpectedLogLine(kSingleStreamLog);
   streams_.push_back(new Stream(this, true));
-  EXPECT_EQ(kEventSignaled, receiver_trace_.Wait());
+  EXPECT_TRUE(receiver_trace_.Wait());
 
   send_config_.rtp.extensions.push_back(
       RtpExtension(RtpExtension::kAbsSendTime, kASTExtensionId));
   receiver_trace_.PushExpectedLogLine("Switching to absolute send time RBE.");
   receiver_trace_.PushExpectedLogLine(kAbsSendTimeLog);
   streams_.push_back(new Stream(this, true));
-  EXPECT_EQ(kEventSignaled, receiver_trace_.Wait());
+  EXPECT_TRUE(receiver_trace_.Wait());
 }
 
 TEST_F(BitrateEstimatorTest, SwitchesToASTForVideo) {
@@ -325,14 +323,14 @@ TEST_F(BitrateEstimatorTest, SwitchesToASTForVideo) {
   receiver_trace_.PushExpectedLogLine(kSingleStreamLog);
   receiver_trace_.PushExpectedLogLine(kSingleStreamLog);
   streams_.push_back(new Stream(this, false));
-  EXPECT_EQ(kEventSignaled, receiver_trace_.Wait());
+  EXPECT_TRUE(receiver_trace_.Wait());
 
   send_config_.rtp.extensions[0] =
       RtpExtension(RtpExtension::kAbsSendTime, kASTExtensionId);
   receiver_trace_.PushExpectedLogLine("Switching to absolute send time RBE.");
   receiver_trace_.PushExpectedLogLine(kAbsSendTimeLog);
   streams_.push_back(new Stream(this, false));
-  EXPECT_EQ(kEventSignaled, receiver_trace_.Wait());
+  EXPECT_TRUE(receiver_trace_.Wait());
 }
 
 TEST_F(BitrateEstimatorTest, SwitchesToASTThenBackToTOFForVideo) {
@@ -341,14 +339,14 @@ TEST_F(BitrateEstimatorTest, SwitchesToASTThenBackToTOFForVideo) {
   receiver_trace_.PushExpectedLogLine(kSingleStreamLog);
   receiver_trace_.PushExpectedLogLine(kSingleStreamLog);
   streams_.push_back(new Stream(this, false));
-  EXPECT_EQ(kEventSignaled, receiver_trace_.Wait());
+  EXPECT_TRUE(receiver_trace_.Wait());
 
   send_config_.rtp.extensions[0] =
       RtpExtension(RtpExtension::kAbsSendTime, kASTExtensionId);
   receiver_trace_.PushExpectedLogLine("Switching to absolute send time RBE.");
   receiver_trace_.PushExpectedLogLine(kAbsSendTimeLog);
   streams_.push_back(new Stream(this, false));
-  EXPECT_EQ(kEventSignaled, receiver_trace_.Wait());
+  EXPECT_TRUE(receiver_trace_.Wait());
 
   send_config_.rtp.extensions[0] =
       RtpExtension(RtpExtension::kTOffset, kTOFExtensionId);
@@ -358,6 +356,6 @@ TEST_F(BitrateEstimatorTest, SwitchesToASTThenBackToTOFForVideo) {
   streams_.push_back(new Stream(this, false));
   streams_[0]->StopSending();
   streams_[1]->StopSending();
-  EXPECT_EQ(kEventSignaled, receiver_trace_.Wait());
+  EXPECT_TRUE(receiver_trace_.Wait());
 }
 }  // namespace webrtc