Revert "Update webrtc&libjingle 6774:6799."

content/renderer/media/webrtc/webrtc_local_audio_track_adapter.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/media/webrtc/webrtc_local_audio_track_adapter.h"
 
 #include "base/logging.h"
 #include "content/renderer/media/media_stream_audio_processor.h"
 #include "content/renderer/media/webrtc/webrtc_audio_sink_adapter.h"
 #include "content/renderer/media/webrtc_local_audio_track.h"
 #include "third_party/libjingle/source/talk/app/webrtc/mediastreaminterface.h"
 
 namespace content {
 
 static const char kAudioTrackKind[] = "audio";
 
 scoped_refptr<WebRtcLocalAudioTrackAdapter>
 WebRtcLocalAudioTrackAdapter::Create(
     const std::string& label,
     webrtc::AudioSourceInterface* track_source) {
-  rtc::RefCountedObject<WebRtcLocalAudioTrackAdapter>* adapter =
-      new rtc::RefCountedObject<WebRtcLocalAudioTrackAdapter>(
+  talk_base::RefCountedObject<WebRtcLocalAudioTrackAdapter>* adapter =
+      new talk_base::RefCountedObject<WebRtcLocalAudioTrackAdapter>(
           label, track_source);
   return adapter;
 }
 
 WebRtcLocalAudioTrackAdapter::WebRtcLocalAudioTrackAdapter(
     const std::string& label,
     webrtc::AudioSourceInterface* track_source)
     : webrtc::MediaStreamTrack<webrtc::AudioTrackInterface>(label),
       owner_(NULL),
       track_source_(track_source),
@@ skipping 58 matching lines @@
   // false here in order not to overwrite the value from WebRTC.
   // TODO(xians): Remove this after we turn on the APM in Chrome by default.
   // http://crbug/365672 .
   if (!MediaStreamAudioProcessor::IsAudioTrackProcessingEnabled())
     return false;
 
   *level = signal_level_;
   return true;
 }
 
-rtc::scoped_refptr<webrtc::AudioProcessorInterface>
+talk_base::scoped_refptr<webrtc::AudioProcessorInterface>
 WebRtcLocalAudioTrackAdapter::GetAudioProcessor() {
   base::AutoLock auto_lock(lock_);
   return audio_processor_.get();
 }
 
 std::vector<int> WebRtcLocalAudioTrackAdapter::VoeChannels() const {
   base::AutoLock auto_lock(lock_);
   return voe_channels_;
 }
 
@@ skipping 37 matching lines @@
   // When the audio track processing is disabled, WebRtcLocalAudioTrackAdapter
   // is used to pass the channel ids to WebRtcAudioDeviceImpl, the data flow
   // becomes WebRtcAudioDeviceImpl ==> WebRTC.
   // TODO(xians): Only return NULL after the APM in WebRTC is deprecated.
   // See See http://crbug/365672 for details.
   return MediaStreamAudioProcessor::IsAudioTrackProcessingEnabled()?
       NULL : this;
 }
 
 }  // namespace content