Remove DISABLED_ON_ macros.

webrtc/common_video/libyuv/scaler_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 <math.h>
 #include <string.h>
 
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webrtc/common_video/libyuv/include/scaler.h"
 #include "webrtc/system_wrappers/include/tick_util.h"
 #include "webrtc/test/testsupport/fileutils.h"
-#include "webrtc/test/testsupport/gtest_disable.h"
 
 namespace webrtc {
 
 class TestScaler : public ::testing::Test {
  protected:
   TestScaler();
   virtual void SetUp();
   virtual void TearDown();
 
   void ScaleSequence(ScaleMethod method,
@@ skipping 79 matching lines @@
                           width_, half_width_, half_width_);
   EXPECT_EQ(0, test_scaler_.Scale(test_frame_, &test_frame2));
   EXPECT_GT(width_ * height_, test_frame2.allocated_size(kYPlane));
   EXPECT_GT(size_uv_, test_frame2.allocated_size(kUPlane));
   EXPECT_GT(size_uv_, test_frame2.allocated_size(kVPlane));
   EXPECT_EQ(half_width_, test_frame2.width());
   EXPECT_EQ(half_height_, test_frame2.height());
 }
 
 // TODO(mikhal): Converge the test into one function that accepts the method.
-TEST_F(TestScaler, DISABLED_ON_ANDROID(PointScaleTest)) {
+#if defined(WEBRTC_ANDROID)
+#define MAYBE_PointScaleTest DISABLED_PointScaleTest
+#else
+#define MAYBE_PointScaleTest PointScaleTest
+#endif
+TEST_F(TestScaler, MAYBE_PointScaleTest) {
   double avg_psnr;
   FILE* source_file2;
   ScaleMethod method = kScalePoint;
   std::string out_name = webrtc::test::OutputPath() +
                          "LibYuvTest_PointScale_176_144.yuv";
   ScaleSequence(method,
                 source_file_, out_name,
                 width_, height_,
                 half_width_, half_height_);
   // Upsample back up and check PSNR.
@@ skipping 46 matching lines @@
                 352, 288);
   avg_psnr = ComputeAvgSequencePSNR(source_file_, out_name, width_, height_);
   printf("PSNR for scaling from: %d %d, down/up to: %d %d, and back to "
       "original size: %f \n", width_, height_, 282, 231, avg_psnr);
   // Average PSNR for lower bound in assert is ~0.1dB lower than the actual
   // average PSNR under same conditions.
   ASSERT_GT(avg_psnr, 25.8);
   ASSERT_EQ(0, fclose(source_file2));
 }
 
-TEST_F(TestScaler, DISABLED_ON_ANDROID(BiLinearScaleTest)) {
+#if defined(WEBRTC_ANDROID)
+#define MAYBE_BilinearScaleTest DISABLED_BiLinearScaleTest
+#else
+#define MAYBE_BilinearScaleTest BiLinearScaleTest
+#endif
+TEST_F(TestScaler, MAYBE_BiLinearScaleTest) {
   double avg_psnr;
   FILE* source_file2;
   ScaleMethod method = kScaleBilinear;
   std::string out_name = webrtc::test::OutputPath() +
                          "LibYuvTest_BilinearScale_176_144.yuv";
   ScaleSequence(method,
                 source_file_, out_name,
                 width_, height_,
                 width_ / 2, height_ / 2);
   // Up-sample back up and check PSNR.
@@ skipping 31 matching lines @@
                 width_, height_,
                 300, 200);
   out_name = webrtc::test::OutputPath() +
              "LibYuvTest_BilinearScale_400_300.yuv";
   ScaleSequence(method,
                 source_file_, out_name,
                 width_, height_,
                 400, 300);
 }
 
-TEST_F(TestScaler, DISABLED_ON_ANDROID(BoxScaleTest)) {
+#if defined(WEBRTC_ANDROID)
+#define MAYBE_BoxScaleTest DISABLED_BoxScaleTest
+#else
+#define MAYBE_BoxScaleTest BoxScaleTest
+#endif
+TEST_F(TestScaler, MAYBE_BoxScaleTest) {
   double avg_psnr;
   FILE* source_file2;
   ScaleMethod method = kScaleBox;
   std::string out_name = webrtc::test::OutputPath() +
                          "LibYuvTest_BoxScale_176_144.yuv";
   ScaleSequence(method,
                 source_file_, out_name,
                 width_, height_,
                 width_ / 2, height_ / 2);
   // Up-sample back up and check PSNR.
@@ skipping 124 matching lines @@
   if (frame_count) {
     printf("Scaling[%d %d] => [%d %d]: ",
            src_width, src_height, dst_width, dst_height);
     printf("Average time per frame[ms]: %.2lf\n",
              (static_cast<double>(total_clock) / frame_count));
   }
   ASSERT_EQ(0, fclose(output_file));
 }
 
 }  // namespace webrtc