Roll chromium_revision 4df108a..2a70cb1 (367307:367468)

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 db7ca41a7304a512b010405813daa0f53c69bd50..24ee2963d427c8c9cc7de376282a8821e08e090a 100644
--- a/webrtc/video/video_send_stream_tests.cc
+++ b/webrtc/video/video_send_stream_tests.cc
@@ -2144,6 +2144,9 @@ TEST_F(VideoSendStreamTest, Vp9NonFlexMode_1Tl2SLayers) {
   TestVp9NonFlexMode(kNumTemporalLayers, kNumSpatialLayers);
 }
 
+#if !defined(MEMORY_SANITIZER)
+// Fails under MemorySanitizer:
+// See https://code.google.com/p/webrtc/issues/detail?id=5402.
 TEST_F(VideoSendStreamTest, Vp9NonFlexMode_2Tl2SLayers) {
   const uint8_t kNumTemporalLayers = 2;
   const uint8_t kNumSpatialLayers = 2;
@@ -2155,6 +2158,7 @@ TEST_F(VideoSendStreamTest, Vp9NonFlexMode_3Tl2SLayers) {
   const uint8_t kNumSpatialLayers = 2;
   TestVp9NonFlexMode(kNumTemporalLayers, kNumSpatialLayers);
 }
+#endif
 
 void VideoSendStreamTest::TestVp9NonFlexMode(uint8_t num_temporal_layers,
                                              uint8_t num_spatial_layers) {
@@ -2206,6 +2210,9 @@ void VideoSendStreamTest::TestVp9NonFlexMode(uint8_t num_temporal_layers,
   RunBaseTest(&test, FakeNetworkPipe::Config());
 }
 
+#if !defined(MEMORY_SANITIZER)
+// Fails under MemorySanitizer:
+// See https://code.google.com/p/webrtc/issues/detail?id=5402.
 TEST_F(VideoSendStreamTest, Vp9FlexModeRefCount) {
   class FlexibleMode : public Vp9HeaderObserver {
     void ModifyVideoConfigsHook(
@@ -2230,5 +2237,6 @@ TEST_F(VideoSendStreamTest, Vp9FlexModeRefCount) {
 
   RunBaseTest(&test, FakeNetworkPipe::Config());
 }
+#endif
 
 }  // namespace webrtc