Index: source/libvpx/test/intrapred_test.cc |
=================================================================== |
--- source/libvpx/test/intrapred_test.cc (revision 263011) |
+++ source/libvpx/test/intrapred_test.cc (working copy) |
@@ -26,12 +26,8 @@ |
class IntraPredBase { |
public: |
- virtual ~IntraPredBase() {} |
+ virtual ~IntraPredBase() { libvpx_test::ClearSystemState(); } |
- virtual void TearDown() { |
- libvpx_test::ClearSystemState(); |
- } |
- |
protected: |
void SetupMacroblock(MACROBLOCKD *mbptr, |
MODE_INFO *miptr, |
@@ -227,8 +223,9 @@ |
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*>( |
@@ -308,8 +305,9 @@ |
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*>( |