admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace std::tr1::tuple by ::testing::tuple.

Browse Source 
BUG=webrtc:7129
NOTRY=True

Review-Url: https://codereview.webrtc.org/2686453004
Cr-Commit-Position: refs/heads/master@{#16487}
This commit is contained in:
ehmaldonado 2017-02-08 04:07:11 -08:00 committed by Commit bot
parent 5e5a072f2c
commit abcef5d32e
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
webrtc/pc/mediasession_unittest.cc
View File

@ -2945,13 +2945,13 @@ void TestAudioCodecsAnswer(MediaContentDirection offer_direction,
} // namespace
class AudioCodecsOfferTest
: public ::testing::TestWithParam<std::tr1::tuple<MediaContentDirection,
bool>> {
: public ::testing::TestWithParam<::testing::tuple<MediaContentDirection,
bool>> {
};
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<std::tr1::tuple<MediaContentDirection,
MediaContentDirection,
bool>> {
: public ::testing::TestWithParam<::testing::tuple<MediaContentDirection,
MediaContentDirection,
bool>> {
};
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,