Enable trendline experiment and bayesian bitrate estimator experiment by default.

webrtc/modules/congestion_controller/delay_based_bwe_unittest.cc

Index: webrtc/modules/congestion_controller/delay_based_bwe_unittest.cc
diff --git a/webrtc/modules/congestion_controller/delay_based_bwe_unittest.cc b/webrtc/modules/congestion_controller/delay_based_bwe_unittest.cc
index 559179e5180936e57c208be550273439a8d15c5b..1d72f83b4ba0397255439fe7027b13ce1c46eec9 100644
--- a/webrtc/modules/congestion_controller/delay_based_bwe_unittest.cc
+++ b/webrtc/modules/congestion_controller/delay_based_bwe_unittest.cc
@@ -132,27 +132,25 @@ TEST_F(DelayBasedBweTest, InitialBehavior) {
 TEST_F(DelayBasedBweTest, RateIncreaseReordering) {
   RateIncreaseReorderingTestHelper(674840);
 }
-
 TEST_F(DelayBasedBweTest, RateIncreaseRtpTimestamps) {
   RateIncreaseRtpTimestampsTestHelper(1240);
 }
 
 TEST_F(DelayBasedBweTest, CapacityDropOneStream) {
-  CapacityDropTestHelper(1, false, 567, 0);
+  CapacityDropTestHelper(1, false, 600, 0);
 }
 
 TEST_F(DelayBasedBweTest, CapacityDropPosOffsetChange) {
-  CapacityDropTestHelper(1, false, 200, 30000);
+  CapacityDropTestHelper(1, false, 767, 30000);

[terelius, 2017/03/28 12:18:21]

Are you happy with the new values?

[stefan-webrtc, 2017/03/30 08:30:47]

I think they are fine. They will change again once both this and the bayesian
estimator lands.

 }
 
 TEST_F(DelayBasedBweTest, CapacityDropNegOffsetChange) {
-  CapacityDropTestHelper(1, false, 733, -30000);
+  CapacityDropTestHelper(1, false, 1400, -30000);
 }
 
 TEST_F(DelayBasedBweTest, CapacityDropOneStreamWrap) {
-  CapacityDropTestHelper(1, true, 567, 0);
+  CapacityDropTestHelper(1, true, 600, 0);
 }
-
 TEST_F(DelayBasedBweTest, TestTimestampGrouping) {
   TestTimestampGroupingTestHelper();
 }
@@ -192,48 +190,17 @@ TEST_F(DelayBasedBweExperimentTest, CapacityDropOneStream) {
 }
 
 TEST_F(DelayBasedBweExperimentTest, CapacityDropPosOffsetChange) {
-  CapacityDropTestHelper(1, false, 300, 30000);
+  CapacityDropTestHelper(1, false, 867, 30000);
 }
 
 TEST_F(DelayBasedBweExperimentTest, CapacityDropNegOffsetChange) {
-  CapacityDropTestHelper(1, false, 300, -30000);
+  CapacityDropTestHelper(1, false, 867, -30000);
 }
 
 TEST_F(DelayBasedBweExperimentTest, CapacityDropOneStreamWrap) {
   CapacityDropTestHelper(1, true, 333, 0);
 }
 
-class DelayBasedBweTrendlineExperimentTest : public DelayBasedBweTest {
- public:
-  DelayBasedBweTrendlineExperimentTest()
-      : override_field_trials_("WebRTC-BweTrendlineFilter/Enabled-15,0.9,4/") {
-    bitrate_estimator_.reset(new DelayBasedBwe(nullptr, &clock_));
-  }
-
- private:
-  test::ScopedFieldTrials override_field_trials_;
-};
-
-TEST_F(DelayBasedBweTrendlineExperimentTest, RateIncreaseRtpTimestamps) {
-  RateIncreaseRtpTimestampsTestHelper(1240);
-}
-
-TEST_F(DelayBasedBweTrendlineExperimentTest, CapacityDropOneStream) {
-  CapacityDropTestHelper(1, false, 600, 0);
-}
-
-TEST_F(DelayBasedBweTrendlineExperimentTest, CapacityDropPosOffsetChange) {
-  CapacityDropTestHelper(1, false, 600, 30000);
-}
-
-TEST_F(DelayBasedBweTrendlineExperimentTest, CapacityDropNegOffsetChange) {
-  CapacityDropTestHelper(1, false, 1267, -30000);
-}
-
-TEST_F(DelayBasedBweTrendlineExperimentTest, CapacityDropOneStreamWrap) {
-  CapacityDropTestHelper(1, true, 600, 0);
-}
-
 class DelayBasedBweMedianSlopeExperimentTest : public DelayBasedBweTest {
  public:
   DelayBasedBweMedianSlopeExperimentTest()