Remove DISABLED_ON_ macros.

webrtc/modules/audio_processing/transient/file_utils_unittest.cc

Index: webrtc/modules/audio_processing/transient/file_utils_unittest.cc
diff --git a/webrtc/modules/audio_processing/transient/file_utils_unittest.cc b/webrtc/modules/audio_processing/transient/file_utils_unittest.cc
index 7a035d2b41fbef15ced06bc5ab7ea382084e9aa8..b7e93e16471c0fc96e497805ce2b655a1ed91781 100644
--- a/webrtc/modules/audio_processing/transient/file_utils_unittest.cc
+++ b/webrtc/modules/audio_processing/transient/file_utils_unittest.cc
@@ -17,7 +17,6 @@
 #include "webrtc/base/scoped_ptr.h"
 #include "webrtc/system_wrappers/include/file_wrapper.h"
 #include "webrtc/test/testsupport/fileutils.h"
-#include "webrtc/test/testsupport/gtest_disable.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {
@@ -59,7 +58,11 @@ class TransientFileUtilsTest: public ::testing::Test {
   const std::string kTestFileNamef;
 };
 
-TEST_F(TransientFileUtilsTest, DISABLED_ON_IOS(ConvertByteArrayToFloat)) {
+#if defined(WEBRTC_IOS)
+TEST_F(TransientFileUtilsTest, DISABLED_ConvertByteArrayToFloat) {
+#else
+TEST_F(TransientFileUtilsTest, ConvertByteArrayToFloat) {
+#endif
   float value = 0.0;
 
   EXPECT_EQ(0, ConvertByteArrayToFloat(kPiBytesf, &value));
@@ -72,7 +75,11 @@ TEST_F(TransientFileUtilsTest, DISABLED_ON_IOS(ConvertByteArrayToFloat)) {
   EXPECT_FLOAT_EQ(kAvogadro, value);
 }
 
-TEST_F(TransientFileUtilsTest, DISABLED_ON_IOS(ConvertByteArrayToDouble)) {
+#if defined(WEBRTC_IOS)
+TEST_F(TransientFileUtilsTest, DISABLED_ConvertByteArrayToDouble) {
+#else
+TEST_F(TransientFileUtilsTest, ConvertByteArrayToDouble) {
+#endif
   double value = 0.0;
 
   EXPECT_EQ(0, ConvertByteArrayToDouble(kPiBytes, &value));
@@ -85,7 +92,11 @@ TEST_F(TransientFileUtilsTest, DISABLED_ON_IOS(ConvertByteArrayToDouble)) {
   EXPECT_DOUBLE_EQ(kAvogadro, value);
 }
 
-TEST_F(TransientFileUtilsTest, DISABLED_ON_IOS(ConvertFloatToByteArray)) {
+#if defined(WEBRTC_IOS)
+TEST_F(TransientFileUtilsTest, DISABLED_ConvertFloatToByteArray) {
+#else
+TEST_F(TransientFileUtilsTest, ConvertFloatToByteArray) {
+#endif
   rtc::scoped_ptr<uint8_t[]> bytes(new uint8_t[4]);
 
   EXPECT_EQ(0, ConvertFloatToByteArray(kPi, bytes.get()));
@@ -98,7 +109,11 @@ TEST_F(TransientFileUtilsTest, DISABLED_ON_IOS(ConvertFloatToByteArray)) {
   EXPECT_EQ(0, memcmp(bytes.get(), kAvogadroBytesf, 4));
 }
 
-TEST_F(TransientFileUtilsTest, DISABLED_ON_IOS(ConvertDoubleToByteArray)) {
+#if defined(WEBRTC_IOS)
+TEST_F(TransientFileUtilsTest, DISABLED_ConvertDoubleToByteArray) {
+#else
+TEST_F(TransientFileUtilsTest, ConvertDoubleToByteArray) {
+#endif
   rtc::scoped_ptr<uint8_t[]> bytes(new uint8_t[8]);
 
   EXPECT_EQ(0, ConvertDoubleToByteArray(kPi, bytes.get()));
@@ -111,7 +126,11 @@ TEST_F(TransientFileUtilsTest, DISABLED_ON_IOS(ConvertDoubleToByteArray)) {
   EXPECT_EQ(0, memcmp(bytes.get(), kAvogadroBytes, 8));
 }
 
-TEST_F(TransientFileUtilsTest, DISABLED_ON_IOS(ReadInt16BufferFromFile)) {
+#if defined(WEBRTC_IOS)
+TEST_F(TransientFileUtilsTest, DISABLED_ReadInt16BufferFromFile) {
+#else
+TEST_F(TransientFileUtilsTest, ReadInt16BufferFromFile) {
+#endif
   std::string test_filename = kTestFileName;
 
   rtc::scoped_ptr<FileWrapper> file(FileWrapper::Create());
@@ -149,8 +168,11 @@ TEST_F(TransientFileUtilsTest, DISABLED_ON_IOS(ReadInt16BufferFromFile)) {
   EXPECT_EQ(17631, buffer[kBufferLength - 1]);
 }
 
-TEST_F(TransientFileUtilsTest,
-       DISABLED_ON_IOS(ReadInt16FromFileToFloatBuffer)) {
+#if defined(WEBRTC_IOS)
+TEST_F(TransientFileUtilsTest, DISABLED_ReadInt16FromFileToFloatBuffer) {
+#else
+TEST_F(TransientFileUtilsTest, ReadInt16FromFileToFloatBuffer) {
+#endif
   std::string test_filename = kTestFileName;
 
   rtc::scoped_ptr<FileWrapper> file(FileWrapper::Create());
@@ -191,8 +213,11 @@ TEST_F(TransientFileUtilsTest,
   EXPECT_DOUBLE_EQ(17631, buffer[kBufferLength - 1]);
 }
 
-TEST_F(TransientFileUtilsTest,
-       DISABLED_ON_IOS(ReadInt16FromFileToDoubleBuffer)) {
+#if defined(WEBRTC_IOS)
+TEST_F(TransientFileUtilsTest, DISABLED_ReadInt16FromFileToDoubleBuffer) {
+#else
+TEST_F(TransientFileUtilsTest, ReadInt16FromFileToDoubleBuffer) {
+#endif
   std::string test_filename = kTestFileName;
 
   rtc::scoped_ptr<FileWrapper> file(FileWrapper::Create());
@@ -232,7 +257,11 @@ TEST_F(TransientFileUtilsTest,
   EXPECT_DOUBLE_EQ(17631, buffer[kBufferLength - 1]);
 }
 
-TEST_F(TransientFileUtilsTest, DISABLED_ON_IOS(ReadFloatBufferFromFile)) {
+#if defined(WEBRTC_IOS)
+TEST_F(TransientFileUtilsTest, DISABLED_ReadFloatBufferFromFile) {
+#else
+TEST_F(TransientFileUtilsTest, ReadFloatBufferFromFile) {
+#endif
   std::string test_filename = kTestFileNamef;
 
   rtc::scoped_ptr<FileWrapper> file(FileWrapper::Create());
@@ -269,7 +298,11 @@ TEST_F(TransientFileUtilsTest, DISABLED_ON_IOS(ReadFloatBufferFromFile)) {
   EXPECT_FLOAT_EQ(kAvogadro, buffer[2]);
 }
 
-TEST_F(TransientFileUtilsTest, DISABLED_ON_IOS(ReadDoubleBufferFromFile)) {
+#if defined(WEBRTC_IOS)
+TEST_F(TransientFileUtilsTest, DISABLED_ReadDoubleBufferFromFile) {
+#else
+TEST_F(TransientFileUtilsTest, ReadDoubleBufferFromFile) {
+#endif
   std::string test_filename = kTestFileName;
 
   rtc::scoped_ptr<FileWrapper> file(FileWrapper::Create());
@@ -306,7 +339,11 @@ TEST_F(TransientFileUtilsTest, DISABLED_ON_IOS(ReadDoubleBufferFromFile)) {
   EXPECT_DOUBLE_EQ(kAvogadro, buffer[2]);
 }
 
-TEST_F(TransientFileUtilsTest, DISABLED_ON_IOS(WriteInt16BufferToFile)) {
+#if defined(WEBRTC_IOS)
+TEST_F(TransientFileUtilsTest, DISABLED_WriteInt16BufferToFile) {
+#else
+TEST_F(TransientFileUtilsTest, WriteInt16BufferToFile) {
+#endif
   rtc::scoped_ptr<FileWrapper> file(FileWrapper::Create());
 
   std::string kOutFileName = test::TempFilename(test::OutputPath(),
@@ -348,7 +385,11 @@ TEST_F(TransientFileUtilsTest, DISABLED_ON_IOS(WriteInt16BufferToFile)) {
                       kBufferLength * sizeof(written_buffer[0])));
 }
 
-TEST_F(TransientFileUtilsTest, DISABLED_ON_IOS(WriteFloatBufferToFile)) {
+#if defined(WEBRTC_IOS)
+TEST_F(TransientFileUtilsTest, DISABLED_WriteFloatBufferToFile) {
+#else
+TEST_F(TransientFileUtilsTest, WriteFloatBufferToFile) {
+#endif
   rtc::scoped_ptr<FileWrapper> file(FileWrapper::Create());
 
   std::string kOutFileName = test::TempFilename(test::OutputPath(),
@@ -390,7 +431,11 @@ TEST_F(TransientFileUtilsTest, DISABLED_ON_IOS(WriteFloatBufferToFile)) {
                       kBufferLength * sizeof(written_buffer[0])));
 }
 
-TEST_F(TransientFileUtilsTest, DISABLED_ON_IOS(WriteDoubleBufferToFile)) {
+#if defined(WEBRTC_IOS)
+TEST_F(TransientFileUtilsTest, DISABLED_WriteDoubleBufferToFile) {
+#else
+TEST_F(TransientFileUtilsTest, WriteDoubleBufferToFile) {
+#endif
   rtc::scoped_ptr<FileWrapper> file(FileWrapper::Create());
 
   std::string kOutFileName = test::TempFilename(test::OutputPath(),
@@ -432,7 +477,11 @@ TEST_F(TransientFileUtilsTest, DISABLED_ON_IOS(WriteDoubleBufferToFile)) {
                       kBufferLength * sizeof(written_buffer[0])));
 }
 
-TEST_F(TransientFileUtilsTest, DISABLED_ON_IOS(ExpectedErrorReturnValues)) {
+#if defined(WEBRTC_IOS)
+TEST_F(TransientFileUtilsTest, DISABLED_ExpectedErrorReturnValues) {
+#else
+TEST_F(TransientFileUtilsTest, ExpectedErrorReturnValues) {
+#endif
   std::string test_filename = kTestFileName;
 
   double value;