Move RtcEventLog object from inside VoiceEngine to Call.

webrtc/voice_engine/channel.h

Index: webrtc/voice_engine/channel.h
diff --git a/webrtc/voice_engine/channel.h b/webrtc/voice_engine/channel.h
index 0e87252877c407e9b9f6ec84e019a9712f3206f6..b77fcef15f674397ce335aab0315183f2cd01a04 100644
--- a/webrtc/voice_engine/channel.h
+++ b/webrtc/voice_engine/channel.h
@@ -178,11 +178,9 @@ class Channel
   static int32_t CreateChannel(Channel*& channel,
                                int32_t channelId,
                                uint32_t instanceId,
-                               RtcEventLog* const event_log,
                                const Config& config);
   Channel(int32_t channelId,
           uint32_t instanceId,
-          RtcEventLog* const event_log,
           const Config& config);
   int32_t Init();
   int32_t SetEngineInformation(Statistics& engineStatistics,
@@ -455,6 +453,12 @@ class Channel
   // Disassociate a send channel if it was associated.
   void DisassociateSendChannel(int channel_id);
 
+  // Set a RtcEventLog logging object.
+  void SetRtcEventLog(RtcEventLog* event_log) {
+    rtc::CritScope lock(&event_log_lock_);
+    event_log_ = event_log;
+  }
+
  protected:
   void OnIncomingFractionLoss(int fraction_lost);
 
@@ -492,7 +496,8 @@ class Channel
 
   ChannelState channel_state_;
 
-  RtcEventLog* const event_log_;
+  RtcEventLog* event_log_ GUARDED_BY(event_log_lock_);
+  rtc::CriticalSection event_log_lock_;

[the sun, 2016/03/03 09:25:13]

nit: declare the lock above the members it protects

[ivoc, 2016/03/10 13:15:36]

The lock is gone due to the proxy object.

 
   std::unique_ptr<RtpHeaderParser> rtp_header_parser_;
   std::unique_ptr<RTPPayloadRegistry> rtp_payload_registry_;