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

webrtc/video/rampup_tests.cc

 /*
  *  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.
  */
 
@@ skipping 186 matching lines @@
       // For tests with an explicitly set start bitrate, verify the first
       // bitrate estimate is close to the start bitrate and lower than the
       // test target bitrate. This is to verify a call respects the configured
       // start bitrate, but due to the BWE implementation we can't guarantee the
       // first estimate really is as high as the start bitrate.
       EXPECT_GT(stats.send_bandwidth_bps, 0.9 * start_bitrate_bps_);
       start_bitrate_verified_ = true;
     }
     if (stats.send_bandwidth_bps >= expected_bitrate_bps_) {
       ramp_up_finished_ms_ = clock_->TimeInMilliseconds();
-      observation_complete_->Set();
+      observation_complete_.Set();
     }
   }
 
   return !event_.Wait(kPollIntervalMs);
 }
 
 void RampUpTester::ReportResult(const std::string& measurement,
                                 size_t value,
                                 const std::string& units) const {
   webrtc::test::PrintResult(
@@ skipping 53 matching lines @@
   ReportResult("ramp-up-rtx-padding-sent", rtx_padding_sent, "bytes");
   if (ramp_up_finished_ms_ >= 0) {
     ReportResult("ramp-up-time", ramp_up_finished_ms_ - test_start_ms_,
                  "milliseconds");
   }
 }
 
 void RampUpTester::PerformTest() {
   test_start_ms_ = clock_->TimeInMilliseconds();
   poller_thread_.Start();
-  EXPECT_EQ(kEventSignaled, Wait())
-      << "Timed out while waiting for ramp-up to complete.";
+  EXPECT_TRUE(Wait()) << "Timed out while waiting for ramp-up to complete.";
   TriggerTestDone();
   poller_thread_.Stop();
 }
 
 RampUpDownUpTester::RampUpDownUpTester(size_t num_streams,
                                        unsigned int start_bitrate_bps,
                                        const std::string& extension_type,
                                        bool rtx,
                                        bool red)
     : RampUpTester(num_streams, start_bitrate_bps, extension_type, rtx, red),
@@ skipping 85 matching lines @@
       break;
     }
     case kSecondRampup: {
       if (bitrate_bps > kExpectedHighBitrateBps && !suspended) {
         webrtc::test::PrintResult("ramp_up_down_up",
                                   GetModifierString(),
                                   "second_rampup",
                                   now - state_start_ms_,
                                   "ms",
                                   false);
-        observation_complete_->Set();
+        observation_complete_.Set();
       }
       break;
     }
   }
 }
 
 class RampUpTest : public test::CallTest {
  public:
   RampUpTest() {}
 
@@ skipping 104 matching lines @@
   RampUpTester test(3, 0, RtpExtension::kTransportSequenceNumber, true, true);
   RunBaseTest(&test, FakeNetworkPipe::Config());
 }
 
 TEST_F(RampUpTest, TransportSequenceNumberSingleStreamWithHighStartBitrate) {
   RampUpTester test(1, 0.9 * kSingleStreamTargetBps,
                     RtpExtension::kTransportSequenceNumber, false, false);
   RunBaseTest(&test, FakeNetworkPipe::Config());
 }
 }  // namespace webrtc