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

Unified Diff: webrtc/api/rtcstatscollector_unittest.cc

Issue 2353033005: Refactoring: move ownership of RtcEventLog from Call to PeerConnection (Closed)
Patch Set: Make TSan happy Created 4 years, 3 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/rtcstatscollector_unittest.cc
diff --git a/webrtc/api/rtcstatscollector_unittest.cc b/webrtc/api/rtcstatscollector_unittest.cc
index 446990c574129238a24798453f872d8f234005e3..b4520c0cb16c4f4decdb050aac1ec5661b7a1412 100644
--- a/webrtc/api/rtcstatscollector_unittest.cc
+++ b/webrtc/api/rtcstatscollector_unittest.cc
@@ -27,7 +27,9 @@
#include "webrtc/base/thread_checker.h"
#include "webrtc/base/timedelta.h"
#include "webrtc/base/timeutils.h"
+#include "webrtc/call/rtc_event_log.h"
#include "webrtc/media/base/fakemediaengine.h"
+#include "webrtc/system_wrappers/include/clock.h"
using testing::Return;
using testing::ReturnRef;
@@ -43,14 +45,16 @@ class RTCStatsCollectorTestHelper : public SetSessionDescriptionObserver {
RTCStatsCollectorTestHelper()
: worker_thread_(rtc::Thread::Current()),
network_thread_(rtc::Thread::Current()),
- channel_manager_(new cricket::ChannelManager(
- new cricket::FakeMediaEngine(),
- worker_thread_,
- network_thread_)),
+ channel_manager_(
+ new cricket::ChannelManager(new cricket::FakeMediaEngine(),
+ worker_thread_,
+ network_thread_)),
+ event_log_(RtcEventLog::Create(webrtc::Clock::GetRealTimeClock())),
media_controller_(
MediaControllerInterface::Create(cricket::MediaConfig(),
worker_thread_,
- channel_manager_.get())),
+ channel_manager_.get(),
+ event_log_.get())),
session_(media_controller_.get()),
pc_() {
EXPECT_CALL(pc_, session()).WillRepeatedly(Return(&session_));
@@ -76,6 +80,7 @@ class RTCStatsCollectorTestHelper : public SetSessionDescriptionObserver {
rtc::Thread* const worker_thread_;
rtc::Thread* const network_thread_;
std::unique_ptr<cricket::ChannelManager> channel_manager_;
+ std::unique_ptr<webrtc::RtcEventLog> event_log_;
std::unique_ptr<webrtc::MediaControllerInterface> media_controller_;
MockWebRtcSession session_;
MockPeerConnection pc_;

Powered by Google App Engine
This is Rietveld 408576698