Remove DISABLED_ON_ macros.

webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.cc

Index: webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.cc
diff --git a/webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.cc b/webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.cc
index d4e1e6e3a06bb2096d51c449bcf8bb162d2de3ee..607e5ebf0f80163695f53567b9910efe96bb559e 100644
--- a/webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.cc
+++ b/webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.cc
@@ -22,7 +22,6 @@
 #include "webrtc/test/testsupport/fileutils.h"
 #include "webrtc/test/testsupport/frame_reader.h"
 #include "webrtc/test/testsupport/frame_writer.h"
-#include "webrtc/test/testsupport/gtest_disable.h"
 #include "webrtc/test/testsupport/metrics/video_metrics.h"
 #include "webrtc/test/testsupport/packet_reader.h"
 #include "webrtc/typedefs.h"
@@ -815,7 +814,11 @@ TEST_F(VideoProcessorIntegrationTest, Process10PercentPacketLoss) {
 // target rate/per-frame bandwidth (for each rate update) is within limits.
 // One key frame (first frame only) in sequence.
 TEST_F(VideoProcessorIntegrationTest,
-       DISABLED_ON_ANDROID(ProcessNoLossChangeBitRateVP8)) {
+#if defined(WEBRTC_ANDROID)

[kjellander_webrtc, 2016/01/04 12:52:45]

Please use the MAYBE_ pattern as described on
https://www.chromium.org/developers/tree-sheriffs/sheriff-details-chromium/ha...
since Windows doesn't understand this style.

[pbos-webrtc, 2016/01/04 13:01:27]

Inlined TEST_F instead for readability (imo)

[kjellander_webrtc, 2016/01/04 14:59:06]

I don't like us having different ways of doing this as the code will diverge
over time. Please follow the established pattern instead, even if you think it's
more readable (I'm sure there's a good reason for the MAYBE_ style).
Unless you're signing up for changing the all the existing MAYBE_ entries we
have + writing a new wiki page with guidelines on how to do this?

[pbos-webrtc, 2016/01/04 16:11:42]

Done.

+       DISABLED_ProcessNoLossChangeBitRateVP8) {
+#else
+       ProcessNoLossChangeBitRateVP8) {
+#endif
   // Bitrate and frame rate profile.
   RateProfile rate_profile;
   SetRateProfilePars(&rate_profile, 0, 200, 30, 0);
@@ -847,7 +850,11 @@ TEST_F(VideoProcessorIntegrationTest,
 // Note: quality after update should be higher but we currently compute quality
 // metrics averaged over whole sequence run.
 TEST_F(VideoProcessorIntegrationTest,
-       DISABLED_ON_ANDROID(ProcessNoLossChangeFrameRateFrameDropVP8)) {
+#if defined(WEBRTC_ANDROID)
+       DISABLED_ProcessNoLossChangeFrameRateFrameDropVP8) {
+#else
+       ProcessNoLossChangeFrameRateFrameDropVP8) {
+#endif
   config_.networking_config.packet_loss_probability = 0;
   // Bitrate and frame rate profile.
   RateProfile rate_profile;
@@ -875,7 +882,11 @@ TEST_F(VideoProcessorIntegrationTest,
 // Run with no packet loss, at low bitrate. During this time we should've
 // resized once. Expect 2 key frames generated (first and one for resize).
 TEST_F(VideoProcessorIntegrationTest,
-       DISABLED_ON_ANDROID(ProcessNoLossSpatialResizeFrameDropVP8)) {
+#if defined(WEBRTC_ANDROID)
+       DISABLED_ProcessNoLossSpatialResizeFrameDropVP8) {
+#else
+       ProcessNoLossSpatialResizeFrameDropVP8) {
+#endif
   config_.networking_config.packet_loss_probability = 0;
   // Bitrate and frame rate profile.
   RateProfile rate_profile;
@@ -902,7 +913,11 @@ TEST_F(VideoProcessorIntegrationTest,
 // No dropped frames in this test, and internal spatial resizer is off.
 // One key frame (first frame only) in sequence, so no spatial resizing.
 TEST_F(VideoProcessorIntegrationTest,
-       DISABLED_ON_ANDROID(ProcessNoLossTemporalLayersVP8)) {
+#if defined(WEBRTC_ANDROID)
+       DISABLED_ProcessNoLossTemporalLayersVP8) {
+#else
+       ProcessNoLossTemporalLayersVP8) {
+#endif
   config_.networking_config.packet_loss_probability = 0;
   // Bitrate and frame rate profile.
   RateProfile rate_profile;