Revert of Storing raw audio sink for default audio track.

webrtc/voice_engine/channel.cc

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 1167 matching lines @@
 }
 
 int32_t
 Channel::UpdateLocalTimeStamp()
 {
 
     _timeStamp += static_cast<uint32_t>(_audioFrame.samples_per_channel_);
     return 0;
 }
 
-void Channel::SetSink(const rtc::scoped_refptr<AudioSinkInterface>& sink) {
+void Channel::SetSink(rtc::scoped_ptr<AudioSinkInterface> sink) {
   CriticalSectionScoped cs(&_callbackCritSect);
-  audio_sink_ = sink;
+  audio_sink_ = std::move(sink);
 }
 
 int32_t
 Channel::StartPlayout()
 {
     WEBRTC_TRACE(kTraceInfo, kTraceVoice, VoEId(_instanceId,_channelId),
                  "Channel::StartPlayout()");
     if (channel_state_.Get().playing)
     {
         return 0;
@@ skipping 2902 matching lines @@
   int64_t min_rtt = 0;
   if (_rtpRtcpModule->RTT(remoteSSRC, &rtt, &avg_rtt, &min_rtt, &max_rtt)
       != 0) {
     return 0;
   }
   return rtt;
 }
 
 }  // namespace voe
 }  // namespace webrtc