Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(336)

Unified Diff: webrtc/pc/mediasession_unittest.cc

Issue 2686453004: Replace std::tr1::tuple by ::testing::tuple. (Closed)
Patch Set: Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/pc/mediasession_unittest.cc
diff --git a/webrtc/pc/mediasession_unittest.cc b/webrtc/pc/mediasession_unittest.cc
index cd2ea23001565aba86bb4c032e237343d4c49d95..6676240b0c4e8b258e5098b1e996d4b5a1559ac9 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<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,
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698