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

Unified Diff: webrtc/api/statscollector_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/statscollector_unittest.cc
diff --git a/webrtc/api/statscollector_unittest.cc b/webrtc/api/statscollector_unittest.cc
index b2fb93cb70a4e18282b2c6654dda358f40e9a268..1970c0ce3ffd4ce8cd439dd39e26f5012552abc9 100644
--- a/webrtc/api/statscollector_unittest.cc
+++ b/webrtc/api/statscollector_unittest.cc
@@ -31,10 +31,12 @@
#include "webrtc/base/fakesslidentity.h"
#include "webrtc/base/gunit.h"
#include "webrtc/base/network.h"
+#include "webrtc/call/rtc_event_log.h"
#include "webrtc/media/base/fakemediaengine.h"
#include "webrtc/media/base/test/mock_mediachannel.h"
#include "webrtc/p2p/base/faketransportcontroller.h"
#include "webrtc/pc/channelmanager.h"
+#include "webrtc/system_wrappers/include/clock.h"
using testing::_;
using testing::DoAll;
@@ -486,6 +488,7 @@ class StatsCollectorTest : public testing::Test {
StatsCollectorTest()
: worker_thread_(rtc::Thread::Current()),
network_thread_(rtc::Thread::Current()),
+ event_log_(RtcEventLog::Create(webrtc::Clock::GetRealTimeClock())),
media_engine_(new cricket::FakeMediaEngine()),
channel_manager_(new cricket::ChannelManager(media_engine_,
worker_thread_,
@@ -493,7 +496,8 @@ class StatsCollectorTest : public testing::Test {
media_controller_(
webrtc::MediaControllerInterface::Create(cricket::MediaConfig(),
worker_thread_,
- channel_manager_.get())),
+ channel_manager_.get(),
+ event_log_.get())),
session_(media_controller_.get()) {
// By default, we ignore session GetStats calls.
EXPECT_CALL(session_, GetTransportStats(_)).WillRepeatedly(Return(false));
@@ -753,6 +757,7 @@ class StatsCollectorTest : public testing::Test {
rtc::Thread* const worker_thread_;
rtc::Thread* const network_thread_;
+ std::unique_ptr<webrtc::RtcEventLog> event_log_;
cricket::FakeMediaEngine* media_engine_;
std::unique_ptr<cricket::ChannelManager> channel_manager_;
std::unique_ptr<webrtc::MediaControllerInterface> media_controller_;

Powered by Google App Engine
This is Rietveld 408576698