Revert of Disabled flaky P2PTestConductor tests on ASAN and MSAN.

webrtc/api/peerconnection_unittest.cc

 /*
  *  Copyright 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 2028 matching lines @@
 // Test that GCM isn't used if only the initiator supports it.
 TEST_F(P2PTestConductor, GetGcmInit) {
   TestGcmNegotiation(true, false, kDefaultSrtpCryptoSuite);
 }
 
 // Test that GCM isn't used if only the receiver supports it.
 TEST_F(P2PTestConductor, GetGcmRecv) {
   TestGcmNegotiation(false, true, kDefaultSrtpCryptoSuite);
 }
 
-// Disabled due to flakiness, see http://crbug.com/webrtc/6776
-#if defined(ADDRESS_SANITIZER) || defined(MEMORY_SANITIZER)
-#define MAYBE_LocalP2PTestRtpDataChannel DISABLED_LocalP2PTestRtpDataChannel
-#else
-#define MAYBE_LocalP2PTestRtpDataChannel LocalP2PTestRtpDataChannel
-#endif
 // This test sets up a call between two parties with audio, video and an RTP
 // data channel.
-TEST_F(P2PTestConductor, MAYBE_LocalP2PTestRtpDataChannel) {
+TEST_F(P2PTestConductor, LocalP2PTestRtpDataChannel) {
   FakeConstraints setup_constraints;
   setup_constraints.SetAllowRtpDataChannels();
   ASSERT_TRUE(CreateTestClients(&setup_constraints, &setup_constraints));
   initializing_client()->CreateDataChannel();
   LocalP2PTest();
   ASSERT_TRUE(initializing_client()->data_channel() != nullptr);
   ASSERT_TRUE(receiving_client()->data_channel() != nullptr);
   EXPECT_TRUE_WAIT(initializing_client()->data_observer()->IsOpen(),
                    kMaxWaitMs);
   EXPECT_TRUE_WAIT(receiving_client()->data_observer()->IsOpen(),
@@ skipping 132 matching lines @@
   SendRtpData(initializing_client()->data_channel(), data);
 
   // Wait a while to allow the sent data to arrive before an observer is
   // registered..
   rtc::Thread::Current()->ProcessMessages(100);
 
   MockDataChannelObserver new_observer(receiving_client()->data_channel());
   EXPECT_EQ_WAIT(data, new_observer.last_message(), kMaxWaitMs);
 }
 
-// Disabled due to flakiness, see http://crbug.com/webrtc/6776
-#if defined(ADDRESS_SANITIZER) || defined(MEMORY_SANITIZER)
-#define MAYBE_LocalP2PTestReceiverDoesntSupportData DISABLED_LocalP2PTestReceiverDoesntSupportData
-#else
-#define MAYBE_LocalP2PTestReceiverDoesntSupportData LocalP2PTestReceiverDoesntSupportData
-#endif
 // This test sets up a call between two parties with audio, video and but only
 // the initiating client support data.
-TEST_F(P2PTestConductor, MAYBE_LocalP2PTestReceiverDoesntSupportData) {
+TEST_F(P2PTestConductor, LocalP2PTestReceiverDoesntSupportData) {
   FakeConstraints setup_constraints_1;
   setup_constraints_1.SetAllowRtpDataChannels();
   // Must disable DTLS to make negotiation succeed.
   setup_constraints_1.SetMandatory(
       MediaConstraintsInterface::kEnableDtlsSrtp, false);
   FakeConstraints setup_constraints_2;
   setup_constraints_2.SetMandatory(
       MediaConstraintsInterface::kEnableDtlsSrtp, false);
   ASSERT_TRUE(CreateTestClients(&setup_constraints_1, &setup_constraints_2));
   initializing_client()->CreateDataChannel();
   LocalP2PTest();
   EXPECT_TRUE(initializing_client()->data_channel() != nullptr);
   EXPECT_FALSE(receiving_client()->data_channel());
   EXPECT_FALSE(initializing_client()->data_observer()->IsOpen());
 }
 
-// Disabled due to flakiness, see http://crbug.com/webrtc/6776
-#if defined(ADDRESS_SANITIZER) || defined(MEMORY_SANITIZER)
-#define MAYBE_AddDataChannelAfterRenegotiation DISABLED_AddDataChannelAfterRenegotiation
-#else
-#define MAYBE_AddDataChannelAfterRenegotiation AddDataChannelAfterRenegotiation
-#endif
 // This test sets up a call between two parties with audio, video. When audio
 // and video is setup and flowing and data channel is negotiated.
-TEST_F(P2PTestConductor, MAYBE_AddDataChannelAfterRenegotiation) {
+TEST_F(P2PTestConductor, AddDataChannelAfterRenegotiation) {
   FakeConstraints setup_constraints;
   setup_constraints.SetAllowRtpDataChannels();
   ASSERT_TRUE(CreateTestClients(&setup_constraints, &setup_constraints));
   LocalP2PTest();
   initializing_client()->CreateDataChannel();
   // Send new offer and answer.
   initializing_client()->Negotiate();
   ASSERT_TRUE(initializing_client()->data_channel() != nullptr);
   ASSERT_TRUE(receiving_client()->data_channel() != nullptr);
   EXPECT_TRUE_WAIT(initializing_client()->data_observer()->IsOpen(),
@@ skipping 548 matching lines @@
   server.urls.push_back("turn:hostname2");
   servers.push_back(server);
   EXPECT_TRUE(webrtc::ParseIceServers(servers, &stun_servers_, &turn_servers_));
   EXPECT_EQ(2U, turn_servers_.size());
   EXPECT_NE(turn_servers_[0].priority, turn_servers_[1].priority);
 }
 
 #endif // if !defined(THREAD_SANITIZER)
 
 }  // namespace