| Index: webrtc/voice_engine/channel.h
|
| diff --git a/webrtc/voice_engine/channel.h b/webrtc/voice_engine/channel.h
|
| index 4bfcd74dbfb65fec2a0fcfc127e9378a0291e9fd..da020e6e5de9783990856d65ce48a42dd2939093 100644
|
| --- a/webrtc/voice_engine/channel.h
|
| +++ b/webrtc/voice_engine/channel.h
|
| @@ -405,12 +405,7 @@ class Channel
|
|
|
| // Associate to a send channel.
|
| // Used for obtaining RTT for a receive-only channel.
|
| - void set_associate_send_channel(const ChannelOwner& channel) {
|
| - assert(_channelId != channel.channel()->ChannelId());
|
| - rtc::CritScope lock(&assoc_send_channel_lock_);
|
| - associate_send_channel_ = channel;
|
| - }
|
| -
|
| + void set_associate_send_channel(const ChannelOwner& channel);
|
| // Disassociate a send channel if it was associated.
|
| void DisassociateSendChannel(int channel_id);
|
|
|
|
|