Resolve dependency between rtc_event_log_api and remote_bitrate_estimator

webrtc/modules/remote_bitrate_estimator/overuse_detector.cc

Index: webrtc/modules/remote_bitrate_estimator/overuse_detector.cc
diff --git a/webrtc/modules/remote_bitrate_estimator/overuse_detector.cc b/webrtc/modules/remote_bitrate_estimator/overuse_detector.cc
index 2e3b4b3b0b1baf0ba489d6da94a75cc03e1cdc5e..399daf0ca747d2445ec29fb2dcebf0b6a45dec21 100644
--- a/webrtc/modules/remote_bitrate_estimator/overuse_detector.cc
+++ b/webrtc/modules/remote_bitrate_estimator/overuse_detector.cc
@@ -70,7 +70,7 @@ OveruseDetector::OveruseDetector()
       prev_offset_(0.0),
       time_over_using_(-1),
       overuse_counter_(0),
-      hypothesis_(kBwNormal) {
+      hypothesis_(BandwidthUsage::kBwNormal) {
   if (!AdaptiveThresholdExperimentIsDisabled())
     InitializeExperiment();
 }
@@ -86,7 +86,7 @@ BandwidthUsage OveruseDetector::Detect(double offset,
                                        int num_of_deltas,
                                        int64_t now_ms) {
   if (num_of_deltas < 2) {
-    return kBwNormal;
+    return BandwidthUsage::kBwNormal;
   }
   const double T = std::min(num_of_deltas, kMinNumDeltas) * offset;
   BWE_TEST_LOGGING_PLOT(1, "offset_ms#1", now_ms, offset);
@@ -106,17 +106,17 @@ BandwidthUsage OveruseDetector::Detect(double offset,
       if (offset >= prev_offset_) {
         time_over_using_ = 0;
         overuse_counter_ = 0;
-        hypothesis_ = kBwOverusing;
+        hypothesis_ = BandwidthUsage::kBwOverusing;
       }
     }
   } else if (T < -threshold_) {
     time_over_using_ = -1;
     overuse_counter_ = 0;
-    hypothesis_ = kBwUnderusing;
+    hypothesis_ = BandwidthUsage::kBwUnderusing;
   } else {
     time_over_using_ = -1;
     overuse_counter_ = 0;
-    hypothesis_ = kBwNormal;
+    hypothesis_ = BandwidthUsage::kBwNormal;
   }
   prev_offset_ = offset;