libvpx: Pull from upstream

source/libvpx/test/intrapred_test.cc

 /*
  *  Copyright (c) 2012 The WebM 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 <string.h>
 #include "test/acm_random.h"
 #include "test/clear_system_state.h"
 #include "test/register_state_check.h"
 #include "third_party/googletest/src/include/gtest/gtest.h"
 
 #include "./vpx_config.h"
 #include "./vp8_rtcd.h"
 #include "vp8/common/blockd.h"
 #include "vpx_mem/vpx_mem.h"
 
 namespace {
 
 using libvpx_test::ACMRandom;
 
 class IntraPredBase {
  public:
-  virtual ~IntraPredBase() {}
-
-  virtual void TearDown() {
-    libvpx_test::ClearSystemState();
-  }
+  virtual ~IntraPredBase() { libvpx_test::ClearSystemState(); }
 
  protected:
   void SetupMacroblock(MACROBLOCKD *mbptr,
                        MODE_INFO *miptr,
                        uint8_t *data,
                        int block_size,
                        int stride,
                        int num_planes) {
     mbptr_ = mbptr;
     miptr_ = miptr;
@@ skipping 176 matching lines @@
   int num_planes_;
 };
 
 typedef void (*intra_pred_y_fn_t)(MACROBLOCKD *x,
                                   uint8_t *yabove_row,
                                   uint8_t *yleft,
                                   int left_stride,
                                   uint8_t *ypred_ptr,
                                   int y_stride);
 
-class IntraPredYTest : public ::testing::TestWithParam<intra_pred_y_fn_t>,
-    protected IntraPredBase {
+class IntraPredYTest
+    : public IntraPredBase,
+      public ::testing::TestWithParam<intra_pred_y_fn_t> {
  public:
   static void SetUpTestCase() {
     mb_ = reinterpret_cast<MACROBLOCKD*>(
         vpx_memalign(32, sizeof(MACROBLOCKD)));
     mi_ = reinterpret_cast<MODE_INFO*>(
         vpx_memalign(32, sizeof(MODE_INFO)));
     data_array_ = reinterpret_cast<uint8_t*>(
         vpx_memalign(kDataAlignment, kDataBufferSize));
   }
 
@@ skipping 59 matching lines @@
 typedef void (*intra_pred_uv_fn_t)(MACROBLOCKD *x,
                                    uint8_t *uabove_row,
                                    uint8_t *vabove_row,
                                    uint8_t *uleft,
                                    uint8_t *vleft,
                                    int left_stride,
                                    uint8_t *upred_ptr,
                                    uint8_t *vpred_ptr,
                                    int pred_stride);
 
-class IntraPredUVTest : public ::testing::TestWithParam<intra_pred_uv_fn_t>,
-    protected IntraPredBase {
+class IntraPredUVTest
+    : public IntraPredBase,
+      public ::testing::TestWithParam<intra_pred_uv_fn_t> {
  public:
   static void SetUpTestCase() {
     mb_ = reinterpret_cast<MACROBLOCKD*>(
         vpx_memalign(32, sizeof(MACROBLOCKD)));
     mi_ = reinterpret_cast<MODE_INFO*>(
         vpx_memalign(32, sizeof(MODE_INFO)));
     data_array_ = reinterpret_cast<uint8_t*>(
         vpx_memalign(kDataAlignment, kDataBufferSize));
   }
 
@@ skipping 56 matching lines @@
                         ::testing::Values(
                             vp8_build_intra_predictors_mbuv_s_sse2));
 #endif
 #if HAVE_SSSE3
 INSTANTIATE_TEST_CASE_P(SSSE3, IntraPredUVTest,
                         ::testing::Values(
                             vp8_build_intra_predictors_mbuv_s_ssse3));
 #endif
 
 }  // namespace