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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: talk/app/webrtc/statscollector_unittest.cc

Issue 1363573002: Wire up transport sequence number / send time callbacks to webrtc via libjingle. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Cleanups. Created 5 years, 2 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
« talk/app/webrtc/mediacontroller.cc ('K') | « talk/app/webrtc/mediacontroller.cc ('k') | talk/libjingle_tests.gyp » ('j') | talk/session/media/channel.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: talk/app/webrtc/statscollector_unittest.cc
diff --git a/talk/app/webrtc/statscollector_unittest.cc b/talk/app/webrtc/statscollector_unittest.cc
index 5e658680be50f965cb46e9135efb3de2ba1dc9d5..1c8b9ee5ff4ac2832e801860e46603b99c21553c 100644
--- a/talk/app/webrtc/statscollector_unittest.cc
+++ b/talk/app/webrtc/statscollector_unittest.cc
@@ -804,8 +804,9 @@ TEST_F(StatsCollectorTest, BytesCounterHandles64Bits) {
Return(true)));
MockVideoMediaChannel* media_channel = new MockVideoMediaChannel();
- cricket::VideoChannel video_channel(rtc::Thread::Current(),
- media_channel, NULL, kVideoChannelName, false);
+ cricket::VideoChannel video_channel(rtc::Thread::Current(), media_channel,
+ nullptr, nullptr, kVideoChannelName,
+ false);
StatsReports reports; // returned values.
cricket::VideoSenderInfo video_sender_info;
cricket::VideoMediaInfo stats_read;
@@ -850,8 +851,9 @@ TEST_F(StatsCollectorTest, BandwidthEstimationInfoIsReported) {
Return(true)));
MockVideoMediaChannel* media_channel = new MockVideoMediaChannel();
- cricket::VideoChannel video_channel(rtc::Thread::Current(),
- media_channel, NULL, kVideoChannelName, false);
+ cricket::VideoChannel video_channel(rtc::Thread::Current(), media_channel,
+ nullptr, nullptr, kVideoChannelName,
+ false);
StatsReports reports; // returned values.
cricket::VideoSenderInfo video_sender_info;
@@ -929,8 +931,8 @@ TEST_F(StatsCollectorTest, TrackObjectExistsWithoutUpdateStats) {
StatsCollectorForTest stats(&session_);
MockVideoMediaChannel* media_channel = new MockVideoMediaChannel();
- cricket::VideoChannel video_channel(rtc::Thread::Current(),
- media_channel, NULL, "video", false);
+ cricket::VideoChannel video_channel(rtc::Thread::Current(), media_channel,
+ nullptr, nullptr, "video", false);
AddOutgoingVideoTrackStats();
stats.AddStream(stream_);
@@ -965,8 +967,9 @@ TEST_F(StatsCollectorTest, TrackAndSsrcObjectExistAfterUpdateSsrcStats) {
Return(true)));
MockVideoMediaChannel* media_channel = new MockVideoMediaChannel();
- cricket::VideoChannel video_channel(rtc::Thread::Current(),
- media_channel, NULL, kVideoChannelName, false);
+ cricket::VideoChannel video_channel(rtc::Thread::Current(), media_channel,
+ nullptr, nullptr, kVideoChannelName,
+ false);
AddOutgoingVideoTrackStats();
stats.AddStream(stream_);
@@ -1029,8 +1032,8 @@ TEST_F(StatsCollectorTest, TransportObjectLinkedFromSsrcObject) {
MockVideoMediaChannel* media_channel = new MockVideoMediaChannel();
// The transport_name known by the video channel.
const std::string kVcName("vcname");
- cricket::VideoChannel video_channel(rtc::Thread::Current(),
- media_channel, NULL, kVcName, false);
+ cricket::VideoChannel video_channel(rtc::Thread::Current(), media_channel,
+ nullptr, nullptr, kVcName, false);
AddOutgoingVideoTrackStats();
stats.AddStream(stream_);
@@ -1087,8 +1090,8 @@ TEST_F(StatsCollectorTest, RemoteSsrcInfoIsAbsent) {
MockVideoMediaChannel* media_channel = new MockVideoMediaChannel();
// The transport_name known by the video channel.
const std::string kVcName("vcname");
- cricket::VideoChannel video_channel(rtc::Thread::Current(),
- media_channel, NULL, kVcName, false);
+ cricket::VideoChannel video_channel(rtc::Thread::Current(), media_channel,
+ nullptr, nullptr, kVcName, false);
AddOutgoingVideoTrackStats();
stats.AddStream(stream_);
@@ -1116,8 +1119,8 @@ TEST_F(StatsCollectorTest, RemoteSsrcInfoIsPresent) {
MockVideoMediaChannel* media_channel = new MockVideoMediaChannel();
// The transport_name known by the video channel.
const std::string kVcName("vcname");
- cricket::VideoChannel video_channel(rtc::Thread::Current(),
- media_channel, NULL, kVcName, false);
+ cricket::VideoChannel video_channel(rtc::Thread::Current(), media_channel,
+ nullptr, NULL, kVcName, false);
AddOutgoingVideoTrackStats();
stats.AddStream(stream_);
@@ -1171,8 +1174,9 @@ TEST_F(StatsCollectorTest, ReportsFromRemoteTrack) {
Return(true)));
MockVideoMediaChannel* media_channel = new MockVideoMediaChannel();
- cricket::VideoChannel video_channel(rtc::Thread::Current(),
- media_channel, NULL, kVideoChannelName, false);
+ cricket::VideoChannel video_channel(rtc::Thread::Current(), media_channel,
+ nullptr, nullptr, kVideoChannelName,
+ false);
AddIncomingVideoTrackStats();
stats.AddStream(stream_);
@@ -1486,8 +1490,9 @@ TEST_F(StatsCollectorTest, GetStatsFromLocalAudioTrack) {
MockVoiceMediaChannel* media_channel = new MockVoiceMediaChannel();
// The transport_name known by the voice channel.
const std::string kVcName("vcname");
- cricket::VoiceChannel voice_channel(rtc::Thread::Current(),
- media_engine_, media_channel, NULL, kVcName, false);
+ cricket::VoiceChannel voice_channel(rtc::Thread::Current(), media_engine_,
+ media_channel, nullptr, nullptr, kVcName,
+ false);
AddOutgoingAudioTrackStats();
stats.AddStream(stream_);
stats.AddLocalAudioTrack(audio_track_, kSsrcOfTrack);
@@ -1521,8 +1526,9 @@ TEST_F(StatsCollectorTest, GetStatsFromRemoteStream) {
MockVoiceMediaChannel* media_channel = new MockVoiceMediaChannel();
// The transport_name known by the voice channel.
const std::string kVcName("vcname");
- cricket::VoiceChannel voice_channel(rtc::Thread::Current(),
- media_engine_, media_channel, NULL, kVcName, false);
+ cricket::VoiceChannel voice_channel(rtc::Thread::Current(), media_engine_,
+ media_channel, nullptr, nullptr, kVcName,
+ false);
AddIncomingAudioTrackStats();
stats.AddStream(stream_);
@@ -1550,8 +1556,9 @@ TEST_F(StatsCollectorTest, GetStatsAfterRemoveAudioStream) {
MockVoiceMediaChannel* media_channel = new MockVoiceMediaChannel();
// The transport_name known by the voice channel.
const std::string kVcName("vcname");
- cricket::VoiceChannel voice_channel(rtc::Thread::Current(),
- media_engine_, media_channel, NULL, kVcName, false);
+ cricket::VoiceChannel voice_channel(rtc::Thread::Current(), media_engine_,
+ media_channel, nullptr, nullptr, kVcName,
+ false);
AddOutgoingAudioTrackStats();
stats.AddStream(stream_);
stats.AddLocalAudioTrack(audio_track_.get(), kSsrcOfTrack);
@@ -1611,8 +1618,9 @@ TEST_F(StatsCollectorTest, LocalAndRemoteTracksWithSameSsrc) {
MockVoiceMediaChannel* media_channel = new MockVoiceMediaChannel();
// The transport_name known by the voice channel.
const std::string kVcName("vcname");
- cricket::VoiceChannel voice_channel(rtc::Thread::Current(),
- media_engine_, media_channel, NULL, kVcName, false);
+ cricket::VoiceChannel voice_channel(rtc::Thread::Current(), media_engine_,
+ media_channel, nullptr, nullptr, kVcName,
+ false);
// Create a local stream with a local audio track and adds it to the stats.
AddOutgoingAudioTrackStats();
@@ -1698,8 +1706,9 @@ TEST_F(StatsCollectorTest, TwoLocalTracksWithSameSsrc) {
MockVoiceMediaChannel* media_channel = new MockVoiceMediaChannel();
// The transport_name known by the voice channel.
const std::string kVcName("vcname");
- cricket::VoiceChannel voice_channel(rtc::Thread::Current(),
- media_engine_, media_channel, NULL, kVcName, false);
+ cricket::VoiceChannel voice_channel(rtc::Thread::Current(), media_engine_,
+ media_channel, nullptr, nullptr, kVcName,
+ false);
// Create a local stream with a local audio track and adds it to the stats.
AddOutgoingAudioTrackStats();
« talk/app/webrtc/mediacontroller.cc ('K') | « talk/app/webrtc/mediacontroller.cc ('k') | talk/libjingle_tests.gyp » ('j') | talk/session/media/channel.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698