Re-enable EndToEndTest.PictureIdStateRetainedAfterReinitingVp8 on tsan.

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 48c82f798bedb3a1cec21fc5c3dd5be615ec5e15..4880b819f49d288ef13cf4fc009f39b44faf12d2 100644
--- a/webrtc/video/end_to_end_tests.cc
+++ b/webrtc/video/end_to_end_tests.cc
@@ -4126,25 +4126,41 @@ void EndToEndTest::TestPictureIdStatePreservation(VideoEncoder* encoder) {
   DestroyStreams();
 }
 
-// These tests exposed a race in libvpx, see
-// https://bugs.chromium.org/p/webrtc/issues/detail?id=7663. Disabling the tests
-// on tsan until the race has been fixed.
-#if defined(THREAD_SANITIZER)
-#define MAYBE_PictureIdStateRetainedAfterReinitingVp8 \
-  DISABLED_PictureIdStateRetainedAfterReinitingVp8
-#define MAYBE_PictureIdStateRetainedAfterReinitingSimulcastEncoderAdapter \
-  DISABLED_PictureIdStateRetainedAfterReinitingSimulcastEncoderAdapter
-#else
-#define MAYBE_PictureIdStateRetainedAfterReinitingVp8 \
-  PictureIdStateRetainedAfterReinitingVp8
-#define MAYBE_PictureIdStateRetainedAfterReinitingSimulcastEncoderAdapter \
-  PictureIdStateRetainedAfterReinitingSimulcastEncoderAdapter
-#endif
-TEST_F(EndToEndTest, MAYBE_PictureIdStateRetainedAfterReinitingVp8) {
+TEST_F(EndToEndTest, PictureIdStateRetainedAfterReinitingVp8) {
   std::unique_ptr<VideoEncoder> encoder(VP8Encoder::Create());
   TestPictureIdStatePreservation(encoder.get());
 }
 
+TEST_F(EndToEndTest,

[brandtr, 2017/06/01 09:36:25]

Moved this test for better ordering in the file.

+       PictureIdStateRetainedAfterReinitingSimulcastEncoderAdapter) {
+  class VideoEncoderFactoryAdapter : public webrtc::VideoEncoderFactory {
+   public:
+    explicit VideoEncoderFactoryAdapter(
+        cricket::WebRtcVideoEncoderFactory* factory)
+        : factory_(factory) {}
+    virtual ~VideoEncoderFactoryAdapter() {}
+
+    // Implements webrtc::VideoEncoderFactory.
+    webrtc::VideoEncoder* Create() override {
+      return factory_->CreateVideoEncoder(
+          cricket::VideoCodec(cricket::kVp8CodecName));
+    }
+
+    void Destroy(webrtc::VideoEncoder* encoder) override {
+      return factory_->DestroyVideoEncoder(encoder);
+    }
+
+   private:
+    cricket::WebRtcVideoEncoderFactory* const factory_;
+  };
+
+  cricket::InternalEncoderFactory internal_encoder_factory;
+  SimulcastEncoderAdapter simulcast_encoder_adapter(
+      new VideoEncoderFactoryAdapter(&internal_encoder_factory));
+
+  TestPictureIdStatePreservation(&simulcast_encoder_adapter);
+}
+
 // This test is flaky on linux_memcheck. Disable on all linux bots until
 // flakyness has been fixed.
 // https://bugs.chromium.org/p/webrtc/issues/detail?id=7737
@@ -4313,36 +4329,6 @@ TEST_F(EndToEndTest, MAYBE_TestFlexfecRtpStatePreservation) {
   DestroyStreams();
 }
 
-TEST_F(EndToEndTest,
-       MAYBE_PictureIdStateRetainedAfterReinitingSimulcastEncoderAdapter) {
-  class VideoEncoderFactoryAdapter : public webrtc::VideoEncoderFactory {
-   public:
-    explicit VideoEncoderFactoryAdapter(
-        cricket::WebRtcVideoEncoderFactory* factory)
-        : factory_(factory) {}
-    virtual ~VideoEncoderFactoryAdapter() {}
-
-    // Implements webrtc::VideoEncoderFactory.
-    webrtc::VideoEncoder* Create() override {
-      return factory_->CreateVideoEncoder(
-          cricket::VideoCodec(cricket::kVp8CodecName));
-    }
-
-    void Destroy(webrtc::VideoEncoder* encoder) override {
-      return factory_->DestroyVideoEncoder(encoder);
-    }
-
-   private:
-    cricket::WebRtcVideoEncoderFactory* const factory_;
-  };
-
-  cricket::InternalEncoderFactory internal_encoder_factory;
-  SimulcastEncoderAdapter simulcast_encoder_adapter(
-      new VideoEncoderFactoryAdapter(&internal_encoder_factory));
-
-  TestPictureIdStatePreservation(&simulcast_encoder_adapter);
-}
-
 TEST_F(EndToEndTest, RespectsNetworkState) {
   // TODO(pbos): Remove accepted downtime packets etc. when signaling network
   // down blocks until no more packets will be sent.