Remove base::Tuple

media/gpu/android_video_encode_accelerator.cc

Index: media/gpu/android_video_encode_accelerator.cc
diff --git a/media/gpu/android_video_encode_accelerator.cc b/media/gpu/android_video_encode_accelerator.cc
index ab05101feff19185ea5898872f39e2bbc0521938..1a22424f38a3e24601d7a5a14c299034a63e684b 100644
--- a/media/gpu/android_video_encode_accelerator.cc
+++ b/media/gpu/android_video_encode_accelerator.cc
@@ -6,6 +6,7 @@
 
 #include <memory>
 #include <set>
+#include <tuple>
 
 #include "base/bind.h"
 #include "base/logging.h"
@@ -247,7 +248,7 @@ void AndroidVideoEncodeAccelerator::Encode(
                     kInvalidArgumentError);
 
   pending_frames_.push(
-      base::MakeTuple(frame, force_keyframe, base::Time::Now()));
+      std::make_tuple(frame, force_keyframe, base::Time::Now()));
   DoIOTask();
 }
 
@@ -310,7 +311,7 @@ void AndroidVideoEncodeAccelerator::QueueInput() {
   }
 
   const PendingFrames::value_type& input = pending_frames_.front();
-  bool is_key_frame = base::get<1>(input);
+  bool is_key_frame = std::get<1>(input);
   if (is_key_frame) {
     // Ideally MediaCodec would honor BUFFER_FLAG_SYNC_FRAME so we could
     // indicate this in the QueueInputBuffer() call below and guarantee _this_
@@ -318,7 +319,7 @@ void AndroidVideoEncodeAccelerator::QueueInput() {
     // Instead, we request a key frame "soon".
     media_codec_->RequestKeyFrameSoon();
   }
-  scoped_refptr<VideoFrame> frame = base::get<0>(input);
+  scoped_refptr<VideoFrame> frame = std::get<0>(input);
 
   uint8_t* buffer = NULL;
   size_t capacity = 0;
@@ -352,7 +353,7 @@ void AndroidVideoEncodeAccelerator::QueueInput() {
   status = media_codec_->QueueInputBuffer(input_buf_index, NULL, queued_size,
                                           fake_input_timestamp_);
   UMA_HISTOGRAM_TIMES("Media.AVDA.InputQueueTime",
-                      base::Time::Now() - base::get<2>(input));
+                      base::Time::Now() - std::get<2>(input));
   RETURN_ON_FAILURE(status == media::MEDIA_CODEC_OK,
                     "Failed to QueueInputBuffer: " << status,
                     kPlatformFailureError);