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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: webrtc/api/statscollector_unittest.cc

Issue 1888903003: Network thread (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: rebase Created 4 years, 8 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 | « webrtc/api/peerconnectioninterface_unittest.cc ('k') | webrtc/api/test/peerconnectiontestwrapper.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/api/statscollector_unittest.cc
diff --git a/webrtc/api/statscollector_unittest.cc b/webrtc/api/statscollector_unittest.cc
index 760db0f23112ff824c0789bcfc13a3b968120e8a..3ad907b505b7de52fd966174f5c6212e6c550c17 100644
--- a/webrtc/api/statscollector_unittest.cc
+++ b/webrtc/api/statscollector_unittest.cc
@@ -71,6 +71,7 @@ class MockWebRtcSession : public webrtc::WebRtcSession {
: WebRtcSession(media_controller,
rtc::Thread::Current(),
rtc::Thread::Current(),
+ rtc::Thread::Current(),
nullptr) {}
MOCK_METHOD0(voice_channel, cricket::VoiceChannel*());
MOCK_METHOD0(video_channel, cricket::VideoChannel*());
@@ -493,8 +494,9 @@ class StatsCollectorTest : public testing::Test {
protected:
StatsCollectorTest()
: media_engine_(new cricket::FakeMediaEngine()),
- channel_manager_(
- new cricket::ChannelManager(media_engine_, rtc::Thread::Current())),
+ channel_manager_(new cricket::ChannelManager(media_engine_,
+ rtc::Thread::Current(),
+ rtc::Thread::Current())),
media_controller_(
webrtc::MediaControllerInterface::Create(cricket::MediaConfig(),
rtc::Thread::Current(),
@@ -824,7 +826,8 @@ TEST_F(StatsCollectorTest, BytesCounterHandles64Bits) {
Return(true)));
MockVideoMediaChannel* media_channel = new MockVideoMediaChannel();
- cricket::VideoChannel video_channel(rtc::Thread::Current(), media_channel,
+ cricket::VideoChannel video_channel(rtc::Thread::Current(),
+ rtc::Thread::Current(), media_channel,
nullptr, kVideoChannelName, false);
StatsReports reports; // returned values.
cricket::VideoSenderInfo video_sender_info;
@@ -870,7 +873,8 @@ TEST_F(StatsCollectorTest, BandwidthEstimationInfoIsReported) {
Return(true)));
MockVideoMediaChannel* media_channel = new MockVideoMediaChannel();
- cricket::VideoChannel video_channel(rtc::Thread::Current(), media_channel,
+ cricket::VideoChannel video_channel(rtc::Thread::Current(),
+ rtc::Thread::Current(), media_channel,
nullptr, kVideoChannelName, false);
StatsReports reports; // returned values.
@@ -945,7 +949,8 @@ TEST_F(StatsCollectorTest, TrackObjectExistsWithoutUpdateStats) {
StatsCollectorForTest stats(&pc_);
MockVideoMediaChannel* media_channel = new MockVideoMediaChannel();
- cricket::VideoChannel video_channel(rtc::Thread::Current(), media_channel,
+ cricket::VideoChannel video_channel(rtc::Thread::Current(),
+ rtc::Thread::Current(), media_channel,
nullptr, "video", false);
AddOutgoingVideoTrackStats();
stats.AddStream(stream_);
@@ -981,7 +986,8 @@ TEST_F(StatsCollectorTest, TrackAndSsrcObjectExistAfterUpdateSsrcStats) {
Return(true)));
MockVideoMediaChannel* media_channel = new MockVideoMediaChannel();
- cricket::VideoChannel video_channel(rtc::Thread::Current(), media_channel,
+ cricket::VideoChannel video_channel(rtc::Thread::Current(),
+ rtc::Thread::Current(), media_channel,
nullptr, kVideoChannelName, false);
AddOutgoingVideoTrackStats();
stats.AddStream(stream_);
@@ -1049,7 +1055,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,
+ cricket::VideoChannel video_channel(rtc::Thread::Current(),
+ rtc::Thread::Current(), media_channel,
nullptr, kVcName, false);
AddOutgoingVideoTrackStats();
stats.AddStream(stream_);
@@ -1107,7 +1114,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,
+ cricket::VideoChannel video_channel(rtc::Thread::Current(),
+ rtc::Thread::Current(), media_channel,
nullptr, kVcName, false);
AddOutgoingVideoTrackStats();
stats.AddStream(stream_);
@@ -1133,7 +1141,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,
+ cricket::VideoChannel video_channel(rtc::Thread::Current(),
+ rtc::Thread::Current(), media_channel,
nullptr, kVcName, false);
AddOutgoingVideoTrackStats();
stats.AddStream(stream_);
@@ -1188,7 +1197,8 @@ TEST_F(StatsCollectorTest, ReportsFromRemoteTrack) {
Return(true)));
MockVideoMediaChannel* media_channel = new MockVideoMediaChannel();
- cricket::VideoChannel video_channel(rtc::Thread::Current(), media_channel,
+ cricket::VideoChannel video_channel(rtc::Thread::Current(),
+ rtc::Thread::Current(), media_channel,
nullptr, kVideoChannelName, false);
AddIncomingVideoTrackStats();
stats.AddStream(stream_);
@@ -1500,7 +1510,8 @@ 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_,
+ cricket::VoiceChannel voice_channel(rtc::Thread::Current(),
+ rtc::Thread::Current(), media_engine_,
media_channel, nullptr, kVcName, false);
AddOutgoingAudioTrackStats();
stats.AddStream(stream_);
@@ -1535,7 +1546,8 @@ 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_,
+ cricket::VoiceChannel voice_channel(rtc::Thread::Current(),
+ rtc::Thread::Current(), media_engine_,
media_channel, nullptr, kVcName, false);
AddIncomingAudioTrackStats();
stats.AddStream(stream_);
@@ -1564,7 +1576,8 @@ 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_,
+ cricket::VoiceChannel voice_channel(rtc::Thread::Current(),
+ rtc::Thread::Current(), media_engine_,
media_channel, nullptr, kVcName, false);
AddOutgoingAudioTrackStats();
stats.AddStream(stream_);
@@ -1625,7 +1638,8 @@ 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_,
+ cricket::VoiceChannel voice_channel(rtc::Thread::Current(),
+ rtc::Thread::Current(), media_engine_,
media_channel, nullptr, kVcName, false);
// Create a local stream with a local audio track and adds it to the stats.
@@ -1712,7 +1726,8 @@ 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_,
+ cricket::VoiceChannel voice_channel(rtc::Thread::Current(),
+ rtc::Thread::Current(), media_engine_,
media_channel, nullptr, kVcName, false);
// Create a local stream with a local audio track and adds it to the stats.
« no previous file with comments | « webrtc/api/peerconnectioninterface_unittest.cc ('k') | webrtc/api/test/peerconnectiontestwrapper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698