Index: content/common/gpu/media/video_encode_accelerator_unittest.cc |
diff --git a/content/common/gpu/media/video_encode_accelerator_unittest.cc b/content/common/gpu/media/video_encode_accelerator_unittest.cc |
index f676372ec7b577ecb0cd13f03dd63ea4e42cdf72..c9e60556c9a05c8c5bd10af4c88300f39e35ee14 100644 |
--- a/content/common/gpu/media/video_encode_accelerator_unittest.cc |
+++ b/content/common/gpu/media/video_encode_accelerator_unittest.cc |
@@ -1326,16 +1326,16 @@ void VEAClient::WriteIvfFrameHeader(int frame_index, size_t frame_size) { |
// - If true, switch framerate mid-stream. |
class VideoEncodeAcceleratorTest |
: public ::testing::TestWithParam< |
- Tuple<int, bool, int, bool, bool, bool, bool>> {}; |
+ base::Tuple<int, bool, int, bool, bool, bool, bool>> {}; |
TEST_P(VideoEncodeAcceleratorTest, TestSimpleEncode) { |
- size_t num_concurrent_encoders = get<0>(GetParam()); |
- const bool save_to_file = get<1>(GetParam()); |
- const unsigned int keyframe_period = get<2>(GetParam()); |
- const bool force_bitrate = get<3>(GetParam()); |
- const bool test_perf = get<4>(GetParam()); |
- const bool mid_stream_bitrate_switch = get<5>(GetParam()); |
- const bool mid_stream_framerate_switch = get<6>(GetParam()); |
+ size_t num_concurrent_encoders = base::get<0>(GetParam()); |
+ const bool save_to_file = base::get<1>(GetParam()); |
+ const unsigned int keyframe_period = base::get<2>(GetParam()); |
+ const bool force_bitrate = base::get<3>(GetParam()); |
+ const bool test_perf = base::get<4>(GetParam()); |
+ const bool mid_stream_bitrate_switch = base::get<5>(GetParam()); |
+ const bool mid_stream_framerate_switch = base::get<6>(GetParam()); |
ScopedVector<ClientStateNotification<ClientState> > notes; |
ScopedVector<VEAClient> clients; |
@@ -1393,39 +1393,40 @@ TEST_P(VideoEncodeAcceleratorTest, TestSimpleEncode) { |
INSTANTIATE_TEST_CASE_P( |
SimpleEncode, |
VideoEncodeAcceleratorTest, |
- ::testing::Values(MakeTuple(1, true, 0, false, false, false, false))); |
+ ::testing::Values(base::MakeTuple(1, true, 0, false, false, false, false))); |
INSTANTIATE_TEST_CASE_P( |
EncoderPerf, |
VideoEncodeAcceleratorTest, |
- ::testing::Values(MakeTuple(1, false, 0, false, true, false, false))); |
+ ::testing::Values(base::MakeTuple(1, false, 0, false, true, false, false))); |
INSTANTIATE_TEST_CASE_P( |
ForceKeyframes, |
VideoEncodeAcceleratorTest, |
- ::testing::Values(MakeTuple(1, false, 10, false, false, false, false))); |
+ ::testing::Values(base::MakeTuple(1, false, 10, false, false, false, |
+ false))); |
INSTANTIATE_TEST_CASE_P( |
ForceBitrate, |
VideoEncodeAcceleratorTest, |
- ::testing::Values(MakeTuple(1, false, 0, true, false, false, false))); |
+ ::testing::Values(base::MakeTuple(1, false, 0, true, false, false, false))); |
INSTANTIATE_TEST_CASE_P( |
MidStreamParamSwitchBitrate, |
VideoEncodeAcceleratorTest, |
- ::testing::Values(MakeTuple(1, false, 0, true, false, true, false))); |
+ ::testing::Values(base::MakeTuple(1, false, 0, true, false, true, false))); |
INSTANTIATE_TEST_CASE_P( |
MidStreamParamSwitchFPS, |
VideoEncodeAcceleratorTest, |
- ::testing::Values(MakeTuple(1, false, 0, true, false, false, true))); |
+ ::testing::Values(base::MakeTuple(1, false, 0, true, false, false, true))); |
INSTANTIATE_TEST_CASE_P( |
MultipleEncoders, |
VideoEncodeAcceleratorTest, |
- ::testing::Values(MakeTuple(3, false, 0, false, false, false, false), |
- MakeTuple(3, false, 0, true, false, false, true), |
- MakeTuple(3, false, 0, true, false, true, false))); |
+ ::testing::Values(base::MakeTuple(3, false, 0, false, false, false, false), |
+ base::MakeTuple(3, false, 0, true, false, false, true), |
+ base::MakeTuple(3, false, 0, true, false, true, false))); |
// TODO(posciak): more tests: |
// - async FeedEncoderWithOutput |