| Index: webrtc/voice_engine/channel.cc
 | 
| diff --git a/webrtc/voice_engine/channel.cc b/webrtc/voice_engine/channel.cc
 | 
| index 9e27ce8b7b7162905a036f6d52a639c96d17bfa0..83c96411b4c9a2c1dcb6948234552ba2a320f296 100644
 | 
| --- a/webrtc/voice_engine/channel.cc
 | 
| +++ b/webrtc/voice_engine/channel.cc
 | 
| @@ -494,11 +494,9 @@ bool Channel::OnRecoveredPacket(const uint8_t* rtp_packet,
 | 
|  }
 | 
|  
 | 
|  int32_t Channel::GetAudioFrame(int32_t id, AudioFrame* audioFrame) {
 | 
| -  if (event_log_) {
 | 
| -    unsigned int ssrc;
 | 
| -    RTC_CHECK_EQ(GetLocalSSRC(ssrc), 0);
 | 
| -    event_log_->LogAudioPlayout(ssrc);
 | 
| -  }
 | 
| +  unsigned int ssrc;
 | 
| +  RTC_CHECK_EQ(GetLocalSSRC(ssrc), 0);
 | 
| +  event_log_.LogAudioPlayout(ssrc);
 | 
|    // Get 10ms raw PCM data from the ACM (mixer limits output frequency)
 | 
|    if (audio_coding_->PlayoutData10Ms(audioFrame->sample_rate_hz_, audioFrame) ==
 | 
|        -1) {
 | 
| @@ -674,13 +672,12 @@ int32_t Channel::NeededFrequency(int32_t id) const {
 | 
|  int32_t Channel::CreateChannel(Channel*& channel,
 | 
|                                 int32_t channelId,
 | 
|                                 uint32_t instanceId,
 | 
| -                               RtcEventLog* const event_log,
 | 
|                                 const Config& config) {
 | 
|    WEBRTC_TRACE(kTraceMemory, kTraceVoice, VoEId(instanceId, channelId),
 | 
|                 "Channel::CreateChannel(channelId=%d, instanceId=%d)", channelId,
 | 
|                 instanceId);
 | 
|  
 | 
| -  channel = new Channel(channelId, instanceId, event_log, config);
 | 
| +  channel = new Channel(channelId, instanceId, config);
 | 
|    if (channel == NULL) {
 | 
|      WEBRTC_TRACE(kTraceMemory, kTraceVoice, VoEId(instanceId, channelId),
 | 
|                   "Channel::CreateChannel() unable to allocate memory for"
 | 
| @@ -737,13 +734,10 @@ void Channel::RecordFileEnded(int32_t id) {
 | 
|                 " shutdown");
 | 
|  }
 | 
|  
 | 
| -Channel::Channel(int32_t channelId,
 | 
| -                 uint32_t instanceId,
 | 
| -                 RtcEventLog* const event_log,
 | 
| -                 const Config& config)
 | 
| +Channel::Channel(int32_t channelId, uint32_t instanceId, const Config& config)
 | 
|      : _instanceId(instanceId),
 | 
|        _channelId(channelId),
 | 
| -      event_log_(event_log),
 | 
| +      event_log_(),
 | 
|        rtp_header_parser_(RtpHeaderParser::Create()),
 | 
|        rtp_payload_registry_(
 | 
|            new RTPPayloadRegistry(RTPPayloadStrategy::CreateStrategy(true))),
 | 
| @@ -852,7 +846,7 @@ Channel::Channel(int32_t channelId,
 | 
|          seq_num_allocator_proxy_.get();
 | 
|      configuration.transport_feedback_callback = feedback_observer_proxy_.get();
 | 
|    }
 | 
| -  configuration.event_log = event_log;
 | 
| +  configuration.event_log = &event_log_;
 | 
|  
 | 
|    _rtpRtcpModule.reset(RtpRtcp::CreateRtpRtcp(configuration));
 | 
|  
 | 
| 
 |