Remove base::Tuple

media/gpu/video_encode_accelerator_unittest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <inttypes.h>
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
 #include <memory>
@@ skipping 1554 matching lines @@
 // - If true, save output to file (provided an output filename was supplied).
 // - Force a keyframe every n frames.
 // - Force bitrate; the actual required value is provided as a property
 //   of the input stream, because it depends on stream type/resolution/etc.
 // - If true, measure performance.
 // - If true, switch bitrate mid-stream.
 // - If true, switch framerate mid-stream.
 // - 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;
   base::Thread encoder_thread("EncoderThread");
   ASSERT_TRUE(encoder_thread.Start());
 
   if (g_env->test_streams_.size() > 1)
     num_concurrent_encoders = g_env->test_streams_.size();
 
   // Create all encoders.
@@ skipping 40 matching lines @@
 
   // This ensures all tasks have finished.
   encoder_thread.Stop();
 }
 
 #if !defined(OS_MACOSX)
 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:
 // - async FeedEncoderWithOutput
 // - out-of-order return of outputs to encoder
 // - multiple encoders + decoders
 // - mid-stream encoder_->Destroy()
 
 }  // namespace
 }  // namespace media
@@ skipping 77 matching lines @@
 
   media::g_env =
       reinterpret_cast<media::VideoEncodeAcceleratorTestEnvironment*>(
           testing::AddGlobalTestEnvironment(
               new media::VideoEncodeAcceleratorTestEnvironment(
                   std::move(test_stream_data), log_path, run_at_fps,
                   needs_encode_latency, verify_all_output)));
 
   return RUN_ALL_TESTS();
 }