Merge Timestamp TestVpxRollover tests for Vp8/Vp9

BUG=webm:701

Change-Id: Id0b928db3cbb6263d136d7b9eb8d9453b3c63824

diff --git a/test/timestamp_test.cc b/test/timestamp_test.cc
index 021ea62..41c1928 100644 (file)
--- a/test/timestamp_test.cc
+++ b/test/timestamp_test.cc
@@ -75,8 +75,6 @@ class TimestampTest
   }
 };
 
-class TimestampTestVp9Only : public TimestampTest {};
-
 // Tests encoding in millisecond timebase.
 TEST_P(TimestampTest, EncodeFrames) {
   DummyTimebaseVideoSource video(1, 1000);
@@ -90,9 +88,7 @@ TEST_P(TimestampTest, TestMicrosecondTimebase) {
   ASSERT_NO_FATAL_FAILURE(RunLoop(&video));
 }
 
-// TODO(webm:701): Enable VP8 test when the overflow issue in
-// TestVpxRollover is fixed.
-TEST_P(TimestampTestVp9Only, TestVpxRollover) {
+TEST_P(TimestampTest, TestVpxRollover) {
   DummyTimebaseVideoSource video(1, 1000);
   video.set_starting_pts(922337170351ll);
   ASSERT_NO_FATAL_FAILURE(RunLoop(&video));
@@ -100,10 +96,6 @@ TEST_P(TimestampTestVp9Only, TestVpxRollover) {
 
 VP8_INSTANTIATE_TEST_CASE(TimestampTest,
                           ::testing::Values(::libvpx_test::kTwoPassGood));
-VP8_INSTANTIATE_TEST_CASE(TimestampTestVp9Only,
-                          ::testing::Values(::libvpx_test::kTwoPassGood));
 VP9_INSTANTIATE_TEST_CASE(TimestampTest,
                           ::testing::Values(::libvpx_test::kTwoPassGood));
-VP9_INSTANTIATE_TEST_CASE(TimestampTestVp9Only,
-                          ::testing::Values(::libvpx_test::kTwoPassGood));
 }  // namespace