Remove base::Tuple

media/gpu/video_encode_accelerator_unittest.cc

Index: media/gpu/video_encode_accelerator_unittest.cc
diff --git a/media/gpu/video_encode_accelerator_unittest.cc b/media/gpu/video_encode_accelerator_unittest.cc
index 5b77463b2027e0524a67429997e9dd49b6a7419f..5776fa331e6b6f178725fc27f40d33037c711264 100644
--- a/media/gpu/video_encode_accelerator_unittest.cc
+++ b/media/gpu/video_encode_accelerator_unittest.cc
@@ -1572,18 +1572,18 @@ void VEAClient::WriteIvfFrameHeader(int frame_index, size_t frame_size) {
 // - If true, verify the output frames of encoder.
 class VideoEncodeAcceleratorTest
     : public ::testing::TestWithParam<
-          base::Tuple<int, bool, int, bool, bool, bool, bool, bool>> {};
+          std::tuple<int, bool, int, bool, bool, bool, bool, bool>> {};
 
 TEST_P(VideoEncodeAcceleratorTest, TestSimpleEncode) {
-  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());
+  size_t num_concurrent_encoders = std::get<0>(GetParam());
+  const bool save_to_file = std::get<1>(GetParam());
+  const unsigned int keyframe_period = std::get<2>(GetParam());
+  const bool force_bitrate = std::get<3>(GetParam());
+  const bool test_perf = std::get<4>(GetParam());
+  const bool mid_stream_bitrate_switch = std::get<5>(GetParam());
+  const bool mid_stream_framerate_switch = std::get<6>(GetParam());
   const bool verify_output =
-      base::get<7>(GetParam()) || g_env->verify_all_output();
+      std::get<7>(GetParam()) || g_env->verify_all_output();
 
   ScopedVector<ClientStateNotification<ClientState>> notes;
   ScopedVector<VEAClient> clients;
@@ -1644,65 +1644,65 @@ INSTANTIATE_TEST_CASE_P(
     SimpleEncode,
     VideoEncodeAcceleratorTest,
     ::testing::Values(
-        base::MakeTuple(1, true, 0, false, false, false, false, false),
-        base::MakeTuple(1, true, 0, false, false, false, false, true)));
+        std::make_tuple(1, true, 0, false, false, false, false, false),
+        std::make_tuple(1, true, 0, false, false, false, false, true)));
 
 INSTANTIATE_TEST_CASE_P(
     EncoderPerf,
     VideoEncodeAcceleratorTest,
     ::testing::Values(
-        base::MakeTuple(1, false, 0, false, true, false, false, false)));
+        std::make_tuple(1, false, 0, false, true, false, false, false)));
 
 INSTANTIATE_TEST_CASE_P(
     ForceKeyframes,
     VideoEncodeAcceleratorTest,
     ::testing::Values(
-        base::MakeTuple(1, false, 10, false, false, false, false, false)));
+        std::make_tuple(1, false, 10, false, false, false, false, false)));
 
 INSTANTIATE_TEST_CASE_P(
     ForceBitrate,
     VideoEncodeAcceleratorTest,
     ::testing::Values(
-        base::MakeTuple(1, false, 0, true, false, false, false, false)));
+        std::make_tuple(1, false, 0, true, false, false, false, false)));
 
 INSTANTIATE_TEST_CASE_P(
     MidStreamParamSwitchBitrate,
     VideoEncodeAcceleratorTest,
     ::testing::Values(
-        base::MakeTuple(1, false, 0, true, false, true, false, false)));
+        std::make_tuple(1, false, 0, true, false, true, false, false)));
 
 INSTANTIATE_TEST_CASE_P(
     MidStreamParamSwitchFPS,
     VideoEncodeAcceleratorTest,
     ::testing::Values(
-        base::MakeTuple(1, false, 0, true, false, false, true, false)));
+        std::make_tuple(1, false, 0, true, false, false, true, false)));
 
 INSTANTIATE_TEST_CASE_P(
     MultipleEncoders,
     VideoEncodeAcceleratorTest,
     ::testing::Values(
-        base::MakeTuple(3, false, 0, false, false, false, false, false),
-        base::MakeTuple(3, false, 0, true, false, false, true, false),
-        base::MakeTuple(3, false, 0, true, false, true, false, false)));
+        std::make_tuple(3, false, 0, false, false, false, false, false),
+        std::make_tuple(3, false, 0, true, false, false, true, false),
+        std::make_tuple(3, false, 0, true, false, true, false, false)));
 #else
 INSTANTIATE_TEST_CASE_P(
     SimpleEncode,
     VideoEncodeAcceleratorTest,
     ::testing::Values(
-        base::MakeTuple(1, true, 0, false, false, false, false, false),
-        base::MakeTuple(1, true, 0, false, false, false, false, true)));
+        std::make_tuple(1, true, 0, false, false, false, false, false),
+        std::make_tuple(1, true, 0, false, false, false, false, true)));
 
 INSTANTIATE_TEST_CASE_P(
     EncoderPerf,
     VideoEncodeAcceleratorTest,
     ::testing::Values(
-        base::MakeTuple(1, false, 0, false, true, false, false, false)));
+        std::make_tuple(1, false, 0, false, true, false, false, false)));
 
 INSTANTIATE_TEST_CASE_P(
     MultipleEncoders,
     VideoEncodeAcceleratorTest,
     ::testing::Values(
-        base::MakeTuple(3, false, 0, false, false, false, false, false)));
+        std::make_tuple(3, false, 0, false, false, false, false, false)));
 #endif
 
 // TODO(posciak): more tests: