Remove DISABLED_ON_ macros.

webrtc/modules/audio_processing/transient/wpd_tree_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 "webrtc/modules/audio_processing/transient/wpd_tree.h"
 
 #include <sstream>
 #include <string>
 
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webrtc/base/scoped_ptr.h"
 #include "webrtc/modules/audio_processing/transient/daubechies_8_wavelet_coeffs.h"
 #include "webrtc/modules/audio_processing/transient/file_utils.h"
 #include "webrtc/system_wrappers/include/file_wrapper.h"
 #include "webrtc/test/testsupport/fileutils.h"
-#include "webrtc/test/testsupport/gtest_disable.h"
 
 namespace webrtc {
 
 TEST(WPDTreeTest, Construction) {
   const size_t kTestBufferSize = 100;
   const int kLevels = 5;
   const int kExpectedNumberOfNodes = (1 << (kLevels + 1)) - 1;
 
   float test_buffer[kTestBufferSize];
   memset(test_buffer, 0.f, kTestBufferSize * sizeof(*test_buffer));
@@ skipping 29 matching lines @@
   EXPECT_EQ(-1, tree.Update(NULL, kTestBufferSize));
   EXPECT_EQ(-1, tree.Update(test_buffer, kTestBufferSize - 1));
 }
 
 // This test is for the correctness of the tree.
 // Checks the results from the Matlab equivalent, it is done comparing the
 // results that are stored in the output files from Matlab.
 // It also writes the results in its own set of files in the out directory.
 // Matlab and output files contain all the results in double precision (Little
 // endian) appended.
-TEST(WPDTreeTest, DISABLED_ON_IOS(CorrectnessBasedOnMatlabFiles)) {
+#if defined(WEBRTC_IOS)
+TEST(WPDTreeTest, DISABLED_CorrectnessBasedOnMatlabFiles) {
+#else
+TEST(WPDTreeTest, CorrectnessBasedOnMatlabFiles) {
+#endif
   // 10 ms at 16000 Hz.
   const size_t kTestBufferSize = 160;
   const int kLevels = 3;
   const int kLeaves = 1 << kLevels;
   const size_t kLeavesSamples = kTestBufferSize >> kLevels;
   // Create tree with Discrete Meyer Wavelet Coefficients.
   WPDTree tree(kTestBufferSize,
                kDaubechies8HighPassCoefficients,
                kDaubechies8LowPassCoefficients,
                kDaubechies8CoefficientsLength,
@@ skipping 107 matching lines @@
   // Close all matlab and out files.
   for (int i = 0; i < kLeaves; ++i) {
     matlab_files_data[i]->CloseFile();
     out_files_data[i]->CloseFile();
   }
 
   test_file->CloseFile();
 }
 
 }  // namespace webrtc