| Index: webrtc/voice_engine/channel_manager.cc
|
| diff --git a/webrtc/voice_engine/channel_manager.cc b/webrtc/voice_engine/channel_manager.cc
|
| index 96f6d2b2eec39d5304f2944c82d07a5120c15a11..1b0abe65f4459120ea26e425f5555bc42b7e14b1 100644
|
| --- a/webrtc/voice_engine/channel_manager.cc
|
| +++ b/webrtc/voice_engine/channel_manager.cc
|
| @@ -46,10 +46,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_(rtc::ScopedToUnique(RtcEventLog::Create())) {}
|
| + : instance_id_(instance_id), last_channel_id_(-1), config_(config) {}
|
|
|
| ChannelOwner ChannelManager::CreateChannel() {
|
| return CreateChannelInternal(config_);
|
| @@ -61,8 +58,7 @@ ChannelOwner ChannelManager::CreateChannel(const Config& external_config) {
|
|
|
| ChannelOwner ChannelManager::CreateChannelInternal(const Config& config) {
|
| Channel* channel;
|
| - Channel::CreateChannel(channel, ++last_channel_id_, instance_id_,
|
| - event_log_.get(), config);
|
| + Channel::CreateChannel(channel, ++last_channel_id_, instance_id_, config);
|
| ChannelOwner channel_owner(channel);
|
|
|
| rtc::CritScope crit(&lock_);
|
| @@ -129,10 +125,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_);
|
|
|