| 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 e0f9962c6e5269a0c31c316011103050200b79fb..b3618dad924d6ab602831742a3b8311610c61a2f 100644
|
| --- a/webrtc/video/video_send_stream_tests.cc
|
| +++ b/webrtc/video/video_send_stream_tests.cc
|
| @@ -3168,10 +3168,16 @@ TEST_F(VideoSendStreamTest,
|
| TestRequestSourceRotateVideo(true);
|
| }
|
|
|
| +// Flaky on Win32 Release: 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,
|
|
|