Remove DISABLED_ON_ macros.

webrtc/modules/media_file/media_file_unittest.cc

 /*
  *  Copyright (c) 2012 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/modules/media_file/media_file.h"
 #include "webrtc/system_wrappers/include/sleep.h"
 #include "webrtc/test/testsupport/fileutils.h"
-#include "webrtc/test/testsupport/gtest_disable.h"
 
 class MediaFileTest : public testing::Test {
  protected:
   void SetUp() {
     // Use number 0 as the the identifier and pass to CreateMediaFile.
     media_file_ = webrtc::MediaFile::CreateMediaFile(0);
     ASSERT_TRUE(media_file_ != NULL);
   }
   void TearDown() {
     webrtc::MediaFile::DestroyMediaFile(media_file_);
     media_file_ = NULL;
   }
   webrtc::MediaFile* media_file_;
 };
 
-TEST_F(MediaFileTest, DISABLED_ON_IOS(
-       DISABLED_ON_ANDROID(StartPlayingAudioFileWithoutError))) {
+#if defined(WEBRTC_ANDROID) || defined(WEBRTC_IOS)
+#define MAYBE_StartPlayingAudioFileWithoutError \
+  DISABLED_StartPlayingAudioFileWithoutError
+#else
+#define MAYBE_StartPlayingAudioFileWithoutError \
+  StartPlayingAudioFileWithoutError
+#endif
+TEST_F(MediaFileTest, MAYBE_StartPlayingAudioFileWithoutError) {
   // TODO(leozwang): Use hard coded filename here, we want to
   // loop through all audio files in future
   const std::string audio_file = webrtc::test::ProjectRootPath() +
       "data/voice_engine/audio_tiny48.wav";
   ASSERT_EQ(0, media_file_->StartPlayingAudioFile(
       audio_file.c_str(),
       0,
       false,
       webrtc::kFileFormatWavFile));
 
   ASSERT_EQ(true, media_file_->IsPlaying());
 
   webrtc::SleepMs(1);
 
   ASSERT_EQ(0, media_file_->StopPlaying());
 }
 
-TEST_F(MediaFileTest, DISABLED_ON_IOS(WriteWavFile)) {
+#if defined(WEBRTC_IOS)
+#define MAYBE_WriteWavFile DISABLED_WriteWavFile
+#else
+#define MAYBE_WriteWavFile WriteWavFile
+#endif
+TEST_F(MediaFileTest, MAYBE_WriteWavFile) {
   // Write file.
   static const size_t kHeaderSize = 44;
   static const size_t kPayloadSize = 320;
   webrtc::CodecInst codec = {
     0, "L16", 16000, static_cast<int>(kPayloadSize), 1
   };
   std::string outfile = webrtc::test::OutputPath() + "wavtest.wav";
   ASSERT_EQ(0,
             media_file_->StartRecordingAudioFile(
                 outfile.c_str(), webrtc::kFileFormatWavFile, codec));
@@ skipping 26 matching lines @@
   uint8_t header[kHeaderSize];
   ASSERT_EQ(1u, fread(header, kHeaderSize, 1, f));
   EXPECT_EQ(0, memcmp(kExpectedHeader, header, kHeaderSize));
 
   uint8_t payload[kPayloadSize];
   ASSERT_EQ(1u, fread(payload, kPayloadSize, 1, f));
   EXPECT_EQ(0, memcmp(kFakeData, payload, kPayloadSize));
 
   EXPECT_EQ(0, fclose(f));
 }