Resolve dependency between rtc_event_log_api and remote_bitrate_estimator

webrtc/modules/remote_bitrate_estimator/aimd_rate_control_unittest.cc

 /*
  *  Copyright (c) 2016 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 <memory>
@@ skipping 59 matching lines @@
   auto states = CreateAimdRateControlStates();
   EXPECT_EQ(rtc::Optional<int>(),
             states.aimd_rate_control->GetLastBitrateDecreaseBps());
 }
 
 TEST(AimdRateControlTest, GetLastBitrateDecrease) {
   auto states = CreateAimdRateControlStates();
   constexpr int kBitrate = 300000;
   states.aimd_rate_control->SetEstimate(
       kBitrate, states.simulated_clock->TimeInMilliseconds());
-  UpdateRateControl(states, kBwOverusing, kBitrate - 2000,
+  UpdateRateControl(states, BandwidthUsage::kBwOverusing, kBitrate - 2000,
                     states.simulated_clock->TimeInMilliseconds());
   EXPECT_EQ(rtc::Optional<int>(46700),
             states.aimd_rate_control->GetLastBitrateDecreaseBps());
 }
 
 TEST(AimdRateControlTest, BweLimitedByAckedBitrate) {
   auto states = CreateAimdRateControlStates();
   constexpr int kAckedBitrate = 10000;
   states.aimd_rate_control->SetEstimate(
       kAckedBitrate, states.simulated_clock->TimeInMilliseconds());
   while (states.simulated_clock->TimeInMilliseconds() - kClockInitialTime <
          20000) {
-    UpdateRateControl(states, kBwNormal, kAckedBitrate,
+    UpdateRateControl(states, BandwidthUsage::kBwNormal, kAckedBitrate,
                       states.simulated_clock->TimeInMilliseconds());
     states.simulated_clock->AdvanceTimeMilliseconds(100);
   }
   ASSERT_TRUE(states.aimd_rate_control->ValidEstimate());
   EXPECT_EQ(static_cast<uint32_t>(1.5 * kAckedBitrate + 10000),
             states.aimd_rate_control->LatestEstimate());
 }
 
 TEST(AimdRateControlTest, BweNotLimitedByDecreasingAckedBitrate) {
   auto states = CreateAimdRateControlStates();
   constexpr int kAckedBitrate = 100000;
   states.aimd_rate_control->SetEstimate(
       kAckedBitrate, states.simulated_clock->TimeInMilliseconds());
   while (states.simulated_clock->TimeInMilliseconds() - kClockInitialTime <
          20000) {
-    UpdateRateControl(states, kBwNormal, kAckedBitrate,
+    UpdateRateControl(states, BandwidthUsage::kBwNormal, kAckedBitrate,
                       states.simulated_clock->TimeInMilliseconds());
     states.simulated_clock->AdvanceTimeMilliseconds(100);
   }
   ASSERT_TRUE(states.aimd_rate_control->ValidEstimate());
   // If the acked bitrate decreases the BWE shouldn't be reduced to 1.5x
   // what's being acked, but also shouldn't get to increase more.
   uint32_t prev_estimate = states.aimd_rate_control->LatestEstimate();
-  UpdateRateControl(states, kBwNormal, kAckedBitrate / 2,
+  UpdateRateControl(states, BandwidthUsage::kBwNormal, kAckedBitrate / 2,
                     states.simulated_clock->TimeInMilliseconds());
   uint32_t new_estimate = states.aimd_rate_control->LatestEstimate();
   EXPECT_NEAR(new_estimate, static_cast<uint32_t>(1.5 * kAckedBitrate + 10000),
               2000);
   EXPECT_EQ(new_estimate, prev_estimate);
 }
 }  // namespace webrtc