| Index: talk/app/webrtc/peerconnection_unittest.cc
|
| diff --git a/talk/app/webrtc/peerconnection_unittest.cc b/talk/app/webrtc/peerconnection_unittest.cc
|
| index 8d0793e25f83f90e85f848e7277725490c707824..cf53c44f11cc246a989c4d01d28b20266eec7731 100644
|
| --- a/talk/app/webrtc/peerconnection_unittest.cc
|
| +++ b/talk/app/webrtc/peerconnection_unittest.cc
|
| @@ -1485,15 +1485,8 @@ TEST_F(P2PTestConductor, GetDtls12None) {
|
| kDefaultSrtpCryptoSuite));
|
| }
|
|
|
| -#if defined(MEMORY_SANITIZER)
|
| -// Fails under MemorySanitizer:
|
| -// See https://code.google.com/p/webrtc/issues/detail?id=5381.
|
| -#define MAYBE_GetDtls12Both DISABLED_GetDtls12Both
|
| -#else
|
| -#define MAYBE_GetDtls12Both GetDtls12Both
|
| -#endif
|
| // Test that DTLS 1.2 is used if both ends support it.
|
| -TEST_F(P2PTestConductor, MAYBE_GetDtls12Both) {
|
| +TEST_F(P2PTestConductor, GetDtls12Both) {
|
| PeerConnectionFactory::Options init_options;
|
| init_options.ssl_max_version = rtc::SSL_PROTOCOL_DTLS_12;
|
| PeerConnectionFactory::Options recv_options;
|
|
|