Move Tuple to base namespace.

content/common/gpu/media/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 <algorithm>
 
 #include "base/at_exit.h"
 #include "base/bind.h"
@@ skipping 1308 matching lines @@
 //   instantiated.
 // - 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.
 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;
   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 37 matching lines @@
         base::Bind(&VEAClient::DestroyEncoder, base::Unretained(clients[i])));
   }
 
   // This ensures all tasks have finished.
   encoder_thread.Stop();
 }
 
 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
 // - out-of-order return of outputs to encoder
 // - multiple encoders + decoders
 // - mid-stream encoder_->Destroy()
 
 }  // namespace
 }  // namespace content
 
@@ skipping 72 matching lines @@
 
   content::g_env =
       reinterpret_cast<content::VideoEncodeAcceleratorTestEnvironment*>(
           testing::AddGlobalTestEnvironment(
               new content::VideoEncodeAcceleratorTestEnvironment(
                   test_stream_data.Pass(), log_path, run_at_fps,
                   needs_encode_latency)));
 
   return RUN_ALL_TESTS();
 }