Disable EndToEndTest.ContentTypeSwitches test on Windows due to flakiness

webrtc/video/end_to_end_tests.cc

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..f043ac49cac034b6b59544f9e2d31babbbddfa44 100644
--- a/webrtc/video/end_to_end_tests.cc
+++ b/webrtc/video/end_to_end_tests.cc
@@ -2693,7 +2693,12 @@ void EndToEndTest::VerifyHistogramStats(bool use_rtx,
             metrics::NumSamples("WebRTC.Video.ReceivedFecPacketsInPercent"));
 }
 
-TEST_F(EndToEndTest, ContentTypeSwitches) {
+#if defined(WEBRTC_WIN)

[kjellander_webrtc, 2017/04/13 20:18:54]

Please add a comment like this:
// 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: