| 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 9ce2bce27e598043a0fb1c47826ea662f127975b..2d6f9fb66043c2bf80a8fba52f409ee42b139f58 100644
|
| --- a/webrtc/video/video_send_stream_tests.cc
|
| +++ b/webrtc/video/video_send_stream_tests.cc
|
| @@ -3169,10 +3169,17 @@ 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, RemoveOverheadFromBandwidth) {
|
| +TEST_F(VideoSendStreamTest, MAYBE_RemoveOverheadFromBandwidth) {
|
| test::ScopedFieldTrials override_field_trials(
|
| "WebRTC-SendSideBwe-WithOverhead/Enabled/");
|
| class RemoveOverheadFromBandwidthTest : public test::EndToEndTest,
|
|
|