Remove DISABLED_ON_ macros.

webrtc/modules/video_coding/video_sender_unittest.cc

Index: webrtc/modules/video_coding/video_sender_unittest.cc
diff --git a/webrtc/modules/video_coding/video_sender_unittest.cc b/webrtc/modules/video_coding/video_sender_unittest.cc
index 2daa9d7b2d2b584c3065f985f15b99645c5937b8..94e65c98c4d828de6cca86f5cb7735d9f48eaf39 100644
--- a/webrtc/modules/video_coding/video_sender_unittest.cc
+++ b/webrtc/modules/video_coding/video_sender_unittest.cc
@@ -24,7 +24,6 @@
 #include "webrtc/system_wrappers/include/clock.h"
 #include "webrtc/test/frame_generator.h"
 #include "webrtc/test/testsupport/fileutils.h"
-#include "webrtc/test/testsupport/gtest_disable.h"
 
 using ::testing::_;
 using ::testing::AllOf;
@@ -424,8 +423,11 @@ class TestVideoSenderWithVp8 : public TestVideoSender {
   int available_bitrate_kbps_;
 };
 
-TEST_F(TestVideoSenderWithVp8,
-       DISABLED_ON_IOS(DISABLED_ON_ANDROID(FixedTemporalLayersStrategy))) {
+#if defined(WEBRTC_ANDROID) || defined(WEBRTC_IOS)
+TEST_F(TestVideoSenderWithVp8, DISABLED_FixedTemporalLayersStrategy) {
+#else
+TEST_F(TestVideoSenderWithVp8, FixedTemporalLayersStrategy) {
+#endif
   const int low_b = codec_bitrate_kbps_ * kVp8LayerRateAlloction[2][0];
   const int mid_b = codec_bitrate_kbps_ * kVp8LayerRateAlloction[2][1];
   const int high_b = codec_bitrate_kbps_ * kVp8LayerRateAlloction[2][2];
@@ -439,8 +441,11 @@ TEST_F(TestVideoSenderWithVp8,
   }
 }
 
-TEST_F(TestVideoSenderWithVp8,
-       DISABLED_ON_IOS(DISABLED_ON_ANDROID(RealTimeTemporalLayersStrategy))) {
+#if defined(WEBRTC_ANDROID) || defined(WEBRTC_IOS)
+TEST_F(TestVideoSenderWithVp8, DISABLED_RealTimeTemporalLayersStrategy) {
+#else
+TEST_F(TestVideoSenderWithVp8, RealTimeTemporalLayersStrategy) {
+#endif
   Config extra_options;
   extra_options.Set<TemporalLayers::Factory>(
       new RealTimeTemporalLayersFactory());