Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(516)

Unified Diff: content/renderer/media/webrtc/webrtc_local_audio_track_adapter.cc

Issue 435823002: Revert "Update webrtc&libjingle 6774:6799." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/renderer/media/webrtc/webrtc_local_audio_track_adapter.cc
diff --git a/content/renderer/media/webrtc/webrtc_local_audio_track_adapter.cc b/content/renderer/media/webrtc/webrtc_local_audio_track_adapter.cc
index 96b683785d1e36cbc1cfbb0e57dc1bf9806cc086..d94edb83d47f7bfe80011ed3f57ae9e4188ca3b0 100644
--- a/content/renderer/media/webrtc/webrtc_local_audio_track_adapter.cc
+++ b/content/renderer/media/webrtc/webrtc_local_audio_track_adapter.cc
@@ -18,8 +18,8 @@ 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;
}
@@ -98,7 +98,7 @@ bool WebRtcLocalAudioTrackAdapter::GetSignalLevel(int* 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();
« no previous file with comments | « content/renderer/media/webrtc/webrtc_local_audio_track_adapter.h ('k') | content/renderer/media/webrtc_audio_capturer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698