Use ChannelProxy for most calls on voe::Channel in Audio[Receive|Send]Stream.

webrtc/voice_engine/channel.cc

Index: webrtc/voice_engine/channel.cc
diff --git a/webrtc/voice_engine/channel.cc b/webrtc/voice_engine/channel.cc
index 0a3e69654e2654f32ee6ba50b48e44bf663f5de5..dd8d6b282dcaf0b6741bb04ca42e63cd0d862458 100644
--- a/webrtc/voice_engine/channel.cc
+++ b/webrtc/voice_engine/channel.cc
@@ -3415,6 +3415,13 @@ bool Channel::GetDelayEstimate(int* jitter_buffer_delay_ms,
   return true;
 }
 
+uint32_t Channel::GetDelayEstimate() const {
+  int jitter_buffer_delay_ms = 0;
+  int playout_buffer_delay_ms = 0;
+  GetDelayEstimate(&jitter_buffer_delay_ms, &playout_buffer_delay_ms);
+  return jitter_buffer_delay_ms + playout_buffer_delay_ms;
+}
+
 int Channel::LeastRequiredDelayMs() const {
   return audio_coding_->LeastRequiredDelayMs();
 }