Remove DISABLED_ON_ macros.

webrtc/modules/audio_coding/neteq/neteq_stereo_unittest.cc

Index: webrtc/modules/audio_coding/neteq/neteq_stereo_unittest.cc
diff --git a/webrtc/modules/audio_coding/neteq/neteq_stereo_unittest.cc b/webrtc/modules/audio_coding/neteq/neteq_stereo_unittest.cc
index e02e92dd8fd4ba99b83d5419007c5fab1cf0c27b..3f59d119979e7b237a5d4ff32b64c435a3f43cda 100644
--- a/webrtc/modules/audio_coding/neteq/neteq_stereo_unittest.cc
+++ b/webrtc/modules/audio_coding/neteq/neteq_stereo_unittest.cc
@@ -21,7 +21,6 @@
 #include "webrtc/modules/audio_coding/neteq/tools/input_audio_file.h"
 #include "webrtc/modules/audio_coding/neteq/tools/rtp_generator.h"
 #include "webrtc/test/testsupport/fileutils.h"
-#include "webrtc/test/testsupport/gtest_disable.h"
 
 namespace webrtc {
 
@@ -276,7 +275,11 @@ class NetEqStereoTestNoJitter : public NetEqStereoTest {
   }
 };
 
-TEST_P(NetEqStereoTestNoJitter, DISABLED_ON_ANDROID(RunTest)) {
+#if defined(WEBRTC_ANDROID)
+TEST_P(NetEqStereoTestNoJitter, DISABLED_RunTest) {
+#else
+TEST_P(NetEqStereoTestNoJitter, RunTest) {
+#endif
   RunTest(8);
 }
 
@@ -301,7 +304,11 @@ class NetEqStereoTestPositiveDrift : public NetEqStereoTest {
   double drift_factor;
 };
 
-TEST_P(NetEqStereoTestPositiveDrift, DISABLED_ON_ANDROID(RunTest)) {
+#if defined(WEBRTC_ANDROID)
+TEST_P(NetEqStereoTestPositiveDrift, DISABLED_RunTest) {
+#else
+TEST_P(NetEqStereoTestPositiveDrift, RunTest) {
+#endif
   RunTest(100);
 }
 
@@ -314,7 +321,11 @@ class NetEqStereoTestNegativeDrift : public NetEqStereoTestPositiveDrift {
   }
 };
 
-TEST_P(NetEqStereoTestNegativeDrift, DISABLED_ON_ANDROID(RunTest)) {
+#if defined(WEBRTC_ANDROID)
+TEST_P(NetEqStereoTestNegativeDrift, DISABLED_RunTest) {
+#else
+TEST_P(NetEqStereoTestNegativeDrift, RunTest) {
+#endif
   RunTest(100);
 }
 
@@ -342,7 +353,11 @@ class NetEqStereoTestDelays : public NetEqStereoTest {
   int frame_index_;
 };
 
-TEST_P(NetEqStereoTestDelays, DISABLED_ON_ANDROID(RunTest)) {
+#if defined(WEBRTC_ANDROID)
+TEST_P(NetEqStereoTestDelays, DISABLED_RunTest) {
+#else
+TEST_P(NetEqStereoTestDelays, RunTest) {
+#endif
   RunTest(1000);
 }
 
@@ -361,7 +376,14 @@ class NetEqStereoTestLosses : public NetEqStereoTest {
   int frame_index_;
 };
 
-TEST_P(NetEqStereoTestLosses, DISABLED_ON_ANDROID(RunTest)) {
+#if defined(WEBRTC_ANDROID)
+TEST_P(NetEqStereoTestLosses, DISABLED_RunTest) {
+#else
+// TODO(pbos): Enable on non-Android, this went failing while being accidentally
+// disabled on all platforms and not just Android.
+// https://bugs.chromium.org/p/webrtc/issues/detail?id=5387
+TEST_P(NetEqStereoTestLosses, DISABLED_RunTest) {
+#endif
   RunTest(100);
 }