| Index: webrtc/video/end_to_end_tests.cc
|
| diff --git a/webrtc/video/end_to_end_tests.cc b/webrtc/video/end_to_end_tests.cc
|
| index f171c5b3883ea1fbc524959f7bfc82be3bdb74da..c2af96268b76099a8c2b31ba4fae0e395eb6e0aa 100644
|
| --- a/webrtc/video/end_to_end_tests.cc
|
| +++ b/webrtc/video/end_to_end_tests.cc
|
| @@ -2693,7 +2693,13 @@ void EndToEndTest::VerifyHistogramStats(bool use_rtx,
|
| metrics::NumSamples("WebRTC.Video.ReceivedFecPacketsInPercent"));
|
| }
|
|
|
| -TEST_F(EndToEndTest, ContentTypeSwitches) {
|
| +#if defined(WEBRTC_WIN)
|
| +// Disabled due to flakiness on Windows (bugs.webrtc.org/7483).
|
| +#define MAYBE_ContentTypeSwitches DISABLED_ContentTypeSwitches
|
| +#else
|
| +#define MAYBE_ContentTypeSwitches ContentTypeSwitches
|
| +#endif
|
| +TEST_F(EndToEndTest, MAYBE_ContentTypeSwitches) {
|
| class StatsObserver : public test::BaseTest,
|
| public rtc::VideoSinkInterface<VideoFrame> {
|
| public:
|
|
|