Fix for flaky RemoveOverheadFromBandwidth test.

webrtc/video/video_send_stream_tests.cc

Index: webrtc/video/video_send_stream_tests.cc
diff --git a/webrtc/video/video_send_stream_tests.cc b/webrtc/video/video_send_stream_tests.cc
index b8dd14ff1f89d69e3eae365645cab3c7dee9e5a9..196918a4eb4695d162e95e645ffa579cc51c728a 100644
--- a/webrtc/video/video_send_stream_tests.cc
+++ b/webrtc/video/video_send_stream_tests.cc
@@ -3156,17 +3156,10 @@ TEST_F(VideoSendStreamTest,
   TestRequestSourceRotateVideo(true);
 }
 
-// Flaky on Win http://crbug.com/webrtc/6886
-#if defined(WEBRTC_WIN)
-#define MAYBE_RemoveOverheadFromBandwidth DISABLED_RemoveOverheadFromBandwidth
-#else
-#define MAYBE_RemoveOverheadFromBandwidth RemoveOverheadFromBandwidth
-#endif
-
 // This test verifies that overhead is removed from the bandwidth estimate by
 // testing that the maximum possible target payload rate is smaller than the
 // maximum bandwidth estimate by the overhead rate.
-TEST_F(VideoSendStreamTest, MAYBE_RemoveOverheadFromBandwidth) {
+TEST_F(VideoSendStreamTest, RemoveOverheadFromBandwidth) {
   test::ScopedFieldTrials override_field_trials(
       "WebRTC-SendSideBwe-WithOverhead/Enabled/");
   class RemoveOverheadFromBandwidthTest : public test::EndToEndTest,
@@ -3220,7 +3213,7 @@ TEST_F(VideoSendStreamTest, MAYBE_RemoveOverheadFromBandwidth) {
       bitrate_config.max_bitrate_bps = kMaxBitrateBps;
       bitrate_config.min_bitrate_bps = kMinBitrateBps;
       call_->SetBitrateConfig(bitrate_config);
-      call_->OnTransportOverheadChanged(webrtc::MediaType::VIDEO, 20);
+      call_->OnTransportOverheadChanged(webrtc::MediaType::VIDEO, 40);
 
       // At a bitrate of 60kbps with a packet size of 1200B video and an
       // overhead of 40B per packet video produces 2240bps overhead.
@@ -3228,7 +3221,7 @@ TEST_F(VideoSendStreamTest, MAYBE_RemoveOverheadFromBandwidth) {
       bitrate_changed_event_.Wait(VideoSendStreamTest::kDefaultTimeoutMs);
       {
         rtc::CritScope lock(&crit_);
-        EXPECT_LE(57760u, max_bitrate_bps_);
+        EXPECT_LE(max_bitrate_bps_, 57760u);

[minyue-webrtc, 2017/02/07 13:04:00]

alternatively, we can change this to 57780u right?

[minyue-webrtc, 2017/02/07 13:04:00]

GE?

[minyue-webrtc, 2017/02/07 13:08:50]

forget this comment.

I see the point. We used a wrong overhead 20, which made "max_bitrate_bps_ <
57780", we checked "max_bitrate_bps_>57760" and it can be correct anyway but not
the right thing to test.

       }
     }