Remove base::Tuple

content/browser/media/session/media_session_controller_unittest.cc

 // Copyright 2016 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 "base/tuple.h"
+#include <tuple>
+
 #include "content/browser/media/media_web_contents_observer.h"
 #include "content/browser/media/session/media_session.h"
 #include "content/browser/media/session/media_session_controller.h"
 #include "content/common/media/media_player_delegate_messages.h"
 #include "content/test/test_render_view_host.h"
 #include "content/test/test_web_contents.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace content {
 
@@ skipping 46 matching lines @@
     return base::TimeDelta::FromSeconds(
         MediaSessionController::kMinimumDurationForContentSecs);
   }
 
   template <typename T>
   bool ReceivedMessagePlayPause() {
     const IPC::Message* msg = test_sink().GetUniqueMessageMatching(T::ID);
     if (!msg)
       return false;
 
-    base::Tuple<int> result;
+    std::tuple<int> result;
     if (!T::Read(msg, &result))
       return false;
 
-    EXPECT_EQ(id_.second, base::get<0>(result));
+    EXPECT_EQ(id_.second, std::get<0>(result));
     test_sink().ClearMessages();
-    return id_.second == base::get<0>(result);
+    return id_.second == std::get<0>(result);
   }
 
   template <typename T>
   bool ReceivedMessageVolumeMultiplierUpdate(double expected_multiplier) {
     const IPC::Message* msg = test_sink().GetUniqueMessageMatching(T::ID);
     if (!msg)
       return false;
 
-    base::Tuple<int, double> result;
+    std::tuple<int, double> result;
     if (!T::Read(msg, &result))
       return false;
 
-    EXPECT_EQ(id_.second, base::get<0>(result));
-    if (id_.second != base::get<0>(result))
+    EXPECT_EQ(id_.second, std::get<0>(result));
+    if (id_.second != std::get<0>(result))
       return false;
 
-    EXPECT_EQ(expected_multiplier, base::get<1>(result));
+    EXPECT_EQ(expected_multiplier, std::get<1>(result));
     test_sink().ClearMessages();
-    return expected_multiplier == base::get<1>(result);
+    return expected_multiplier == std::get<1>(result);
   }
 
   WebContentsObserver::MediaPlayerId id_;
   std::unique_ptr<MediaSessionController> controller_;
 };
 
 TEST_F(MediaSessionControllerTest, NoAudioNoSession) {
   ASSERT_TRUE(controller_->Initialize(false, false, DurationJustRight()));
   EXPECT_TRUE(media_session()->IsSuspended());
   EXPECT_FALSE(media_session()->IsControllable());
@@ skipping 97 matching lines @@
   EXPECT_EQ(current_player_id, controller_->get_player_id_for_testing());
 
   // Switch to a remote player, which should release the session.
   ASSERT_TRUE(controller_->Initialize(true, true, DurationJustRight()));
   EXPECT_TRUE(media_session()->IsSuspended());
   EXPECT_FALSE(media_session()->IsControllable());
   EXPECT_EQ(current_player_id, controller_->get_player_id_for_testing());
 }
 
 }  // namespace content