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

Unified Diff: webrtc/api/statscollector_unittest.cc

Issue 1713043002: Late initialize MediaController, for less resource i.e. ProcessThread, usage by PeerConnection. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Ugly but implemented Created 4 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
Index: webrtc/api/statscollector_unittest.cc
diff --git a/webrtc/api/statscollector_unittest.cc b/webrtc/api/statscollector_unittest.cc
index d4a59a1a6d5f360f32dc0a4606477dc8d4a2ce92..2c815b6c7c845758c735270312bc912e1015e6f4 100644
--- a/webrtc/api/statscollector_unittest.cc
+++ b/webrtc/api/statscollector_unittest.cc
@@ -66,9 +66,8 @@ const uint32_t kSsrcOfTrack = 1234;
class MockWebRtcSession : public webrtc::WebRtcSession {
public:
- explicit MockWebRtcSession(webrtc::MediaControllerInterface* media_controller)
- : WebRtcSession(media_controller,
- rtc::Thread::Current(),
+ explicit MockWebRtcSession()
+ : WebRtcSession(rtc::Thread::Current(),
rtc::Thread::Current(),
nullptr) {}
MOCK_METHOD0(voice_channel, cricket::VoiceChannel*());
@@ -486,13 +485,7 @@ class StatsCollectorTest : public testing::Test {
protected:
StatsCollectorTest()
: media_engine_(new cricket::FakeMediaEngine()),
- channel_manager_(
- new cricket::ChannelManager(media_engine_, rtc::Thread::Current())),
- media_controller_(
- webrtc::MediaControllerInterface::Create(cricket::MediaConfig(),
- rtc::Thread::Current(),
- channel_manager_.get())),
- session_(media_controller_.get()) {
+ session_() {
// By default, we ignore session GetStats calls.
EXPECT_CALL(session_, GetTransportStats(_)).WillRepeatedly(Return(false));
// Add default returns for mock classes.
@@ -747,8 +740,6 @@ class StatsCollectorTest : public testing::Test {
}
cricket::FakeMediaEngine* media_engine_;
- rtc::scoped_ptr<cricket::ChannelManager> channel_manager_;
- rtc::scoped_ptr<webrtc::MediaControllerInterface> media_controller_;
MockWebRtcSession session_;
MockPeerConnection pc_;
FakeDataChannelProvider data_channel_provider_;

Powered by Google App Engine
This is Rietveld 408576698