From abcef5d32eeee7a5050873e6bec5a668addca405 Mon Sep 17 00:00:00 2001 From: ehmaldonado Date: Wed, 8 Feb 2017 04:07:11 -0800 Subject: [PATCH] Replace std::tr1::tuple by ::testing::tuple. BUG=webrtc:7129 NOTRY=True Review-Url: https://codereview.webrtc.org/2686453004 Cr-Commit-Position: refs/heads/master@{#16487} --- webrtc/pc/mediasession_unittest.cc | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/webrtc/pc/mediasession_unittest.cc b/webrtc/pc/mediasession_unittest.cc index cd2ea23001..6676240b0c 100644 --- a/webrtc/pc/mediasession_unittest.cc +++ b/webrtc/pc/mediasession_unittest.cc @@ -2945,13 +2945,13 @@ void TestAudioCodecsAnswer(MediaContentDirection offer_direction, } // namespace class AudioCodecsOfferTest - : public ::testing::TestWithParam> { + : public ::testing::TestWithParam<::testing::tuple> { }; TEST_P(AudioCodecsOfferTest, TestCodecsInOffer) { - TestAudioCodecsOffer(std::tr1::get<0>(GetParam()), - std::tr1::get<1>(GetParam())); + TestAudioCodecsOffer(::testing::get<0>(GetParam()), + ::testing::get<1>(GetParam())); } INSTANTIATE_TEST_CASE_P(MediaSessionDescriptionFactoryTest, @@ -2964,15 +2964,15 @@ INSTANTIATE_TEST_CASE_P(MediaSessionDescriptionFactoryTest, ::testing::Bool())); class AudioCodecsAnswerTest - : public ::testing::TestWithParam> { + : public ::testing::TestWithParam<::testing::tuple> { }; TEST_P(AudioCodecsAnswerTest, TestCodecsInAnswer) { - TestAudioCodecsAnswer(std::tr1::get<0>(GetParam()), - std::tr1::get<1>(GetParam()), - std::tr1::get<2>(GetParam())); + TestAudioCodecsAnswer(::testing::get<0>(GetParam()), + ::testing::get<1>(GetParam()), + ::testing::get<2>(GetParam())); } INSTANTIATE_TEST_CASE_P(MediaSessionDescriptionFactoryTest,