| Index: webrtc/voice_engine/channel_manager.cc
|
| diff --git a/webrtc/voice_engine/channel_manager.cc b/webrtc/voice_engine/channel_manager.cc
|
| index 47350b59c9a69c272b9dccd77468b7a49c36cc49..5f20b2ed162b2bd30752c86b2de04c56d3ab2d96 100644
|
| --- a/webrtc/voice_engine/channel_manager.cc
|
| +++ b/webrtc/voice_engine/channel_manager.cc
|
| @@ -47,10 +47,7 @@ ChannelOwner::ChannelRef::ChannelRef(class Channel* channel)
|
| : channel(channel), ref_count(1) {}
|
|
|
| ChannelManager::ChannelManager(uint32_t instance_id, const Config& config)
|
| - : instance_id_(instance_id),
|
| - last_channel_id_(-1),
|
| - config_(config),
|
| - event_log_(RtcEventLog::Create(Clock::GetRealTimeClock())) {}
|
| + : instance_id_(instance_id), last_channel_id_(-1), config_(config) {}
|
|
|
| ChannelOwner ChannelManager::CreateChannel() {
|
| return CreateChannel(CreateBuiltinAudioDecoderFactory());
|
| @@ -75,8 +72,8 @@ ChannelOwner ChannelManager::CreateChannelInternal(
|
| const Config& config,
|
| const rtc::scoped_refptr<AudioDecoderFactory>& decoder_factory) {
|
| Channel* channel;
|
| - Channel::CreateChannel(channel, ++last_channel_id_, instance_id_,
|
| - event_log_.get(), config, decoder_factory);
|
| + Channel::CreateChannel(channel, ++last_channel_id_, instance_id_, config,
|
| + decoder_factory);
|
| ChannelOwner channel_owner(channel);
|
|
|
| rtc::CritScope crit(&lock_);
|
| @@ -143,10 +140,6 @@ size_t ChannelManager::NumOfChannels() const {
|
| return channels_.size();
|
| }
|
|
|
| -RtcEventLog* ChannelManager::GetEventLog() const {
|
| - return event_log_.get();
|
| -}
|
| -
|
| ChannelManager::Iterator::Iterator(ChannelManager* channel_manager)
|
| : iterator_pos_(0) {
|
| channel_manager->GetAllChannels(&channels_);
|
|
|