Remove DISABLED_ON_ macros.

webrtc/modules/audio_coding/test/target_delay_unittest.cc

 /*
  *  Copyright (c) 2013 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.
  */
 
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webrtc/base/scoped_ptr.h"
 #include "webrtc/common_types.h"
 #include "webrtc/modules/audio_coding/codecs/pcm16b/pcm16b.h"
 #include "webrtc/modules/audio_coding/include/audio_coding_module.h"
 #include "webrtc/modules/audio_coding/test/utility.h"
 #include "webrtc/modules/include/module_common_types.h"
 #include "webrtc/system_wrappers/include/sleep.h"
 #include "webrtc/test/testsupport/fileutils.h"
-#include "webrtc/test/testsupport/gtest_disable.h"
 
 namespace webrtc {
 
 class TargetDelayTest : public ::testing::Test {
  protected:
   TargetDelayTest() : acm_(AudioCodingModule::Create(0)) {}
 
   ~TargetDelayTest() {}
 
   void SetUp() {
@@ skipping 161 matching lines @@
 
   int RequiredDelay() {
     return acm_->LeastRequiredDelayMs();
   }
 
   rtc::scoped_ptr<AudioCodingModule> acm_;
   WebRtcRTPHeader rtp_info_;
   uint8_t payload_[kPayloadLenBytes];
 };
 
-TEST_F(TargetDelayTest, DISABLED_ON_ANDROID(OutOfRangeInput)) {
+#if defined(WEBRTC_ANDROID)
+TEST_F(TargetDelayTest, DISABLED_OutOfRangeInput) {
+#else
+TEST_F(TargetDelayTest, OutOfRangeInput) {
+#endif
   OutOfRangeInput();
 }
 
-TEST_F(TargetDelayTest, DISABLED_ON_ANDROID(NoTargetDelayBufferSizeChanges)) {
+#if defined(WEBRTC_ANDROID)
+TEST_F(TargetDelayTest, DISABLED_NoTargetDelayBufferSizeChanges) {
+#else
+TEST_F(TargetDelayTest, NoTargetDelayBufferSizeChanges) {
+#endif
   NoTargetDelayBufferSizeChanges();
 }
 
-TEST_F(TargetDelayTest, DISABLED_ON_ANDROID(WithTargetDelayBufferNotChanging)) {
+#if defined(WEBRTC_ANDROID)
+TEST_F(TargetDelayTest, DISABLED_WithTargetDelayBufferNotChanging) {
+#else
+TEST_F(TargetDelayTest, WithTargetDelayBufferNotChanging) {
+#endif
   WithTargetDelayBufferNotChanging();
 }
 
-TEST_F(TargetDelayTest, DISABLED_ON_ANDROID(RequiredDelayAtCorrectRange)) {
+#if defined(WEBRTC_ANDROID)
+TEST_F(TargetDelayTest, DISABLED_RequiredDelayAtCorrectRange) {
+#else
+TEST_F(TargetDelayTest, RequiredDelayAtCorrectRange) {
+#endif
   RequiredDelayAtCorrectRange();
 }
 
-TEST_F(TargetDelayTest, DISABLED_ON_ANDROID(TargetDelayBufferMinMax)) {
+#if defined(WEBRTC_ANDROID)
+TEST_F(TargetDelayTest, DISABLED_TargetDelayBufferMinMax) {
+#else
+TEST_F(TargetDelayTest, TargetDelayBufferMinMax) {
+#endif
   TargetDelayBufferMinMax();
 }
 
 }  // namespace webrtc