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

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

Issue 429253003: Webrtc deps roll. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
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/mock_peer_connection_dependency_factory.cc
===================================================================
--- content/renderer/media/webrtc/mock_peer_connection_dependency_factory.cc (revision 286889)
+++ content/renderer/media/webrtc/mock_peer_connection_dependency_factory.cc (working copy)
@@ -14,8 +14,8 @@
#include "content/renderer/media/webrtc_local_audio_track.h"
#include "third_party/WebKit/public/platform/WebMediaStreamTrack.h"
#include "third_party/libjingle/source/talk/app/webrtc/mediastreaminterface.h"
-#include "third_party/libjingle/source/talk/base/scoped_ref_ptr.h"
#include "third_party/libjingle/source/talk/media/base/videocapturer.h"
+#include "third_party/webrtc/base/scoped_ref_ptr.h"
using webrtc::AudioSourceInterface;
using webrtc::AudioTrackInterface;
@@ -90,13 +90,13 @@
return video_track_vector_;
}
-talk_base::scoped_refptr<AudioTrackInterface> MockMediaStream::FindAudioTrack(
+rtc::scoped_refptr<AudioTrackInterface> MockMediaStream::FindAudioTrack(
const std::string& track_id) {
AudioTrackVector::iterator it = FindTrack(&audio_track_vector_, track_id);
return it == audio_track_vector_.end() ? NULL : *it;
}
-talk_base::scoped_refptr<VideoTrackInterface> MockMediaStream::FindVideoTrack(
+rtc::scoped_refptr<VideoTrackInterface> MockMediaStream::FindVideoTrack(
const std::string& track_id) {
VideoTrackVector::iterator it = FindTrack(&video_track_vector_, track_id);
return it == video_track_vector_.end() ? NULL : *it;
@@ -443,14 +443,14 @@
const webrtc::MediaConstraintsInterface* constraints,
blink::WebFrame* frame,
webrtc::PeerConnectionObserver* observer) {
- return new talk_base::RefCountedObject<MockPeerConnectionImpl>(this);
+ return new rtc::RefCountedObject<MockPeerConnectionImpl>(this);
}
scoped_refptr<webrtc::AudioSourceInterface>
MockPeerConnectionDependencyFactory::CreateLocalAudioSource(
const webrtc::MediaConstraintsInterface* constraints) {
last_audio_source_ =
- new talk_base::RefCountedObject<MockAudioSource>(constraints);
+ new rtc::RefCountedObject<MockAudioSource>(constraints);
return last_audio_source_;
}
@@ -464,7 +464,7 @@
MockPeerConnectionDependencyFactory::CreateVideoSource(
cricket::VideoCapturer* capturer,
const blink::WebMediaConstraints& constraints) {
- last_video_source_ = new talk_base::RefCountedObject<MockVideoSource>();
+ last_video_source_ = new rtc::RefCountedObject<MockVideoSource>();
last_video_source_->SetVideoCapturer(capturer);
return last_video_source_;
}
@@ -478,7 +478,7 @@
scoped_refptr<webrtc::MediaStreamInterface>
MockPeerConnectionDependencyFactory::CreateLocalMediaStream(
const std::string& label) {
- return new talk_base::RefCountedObject<MockMediaStream>(label);
+ return new rtc::RefCountedObject<MockMediaStream>(label);
}
scoped_refptr<webrtc::VideoTrackInterface>
@@ -486,7 +486,7 @@
const std::string& id,
webrtc::VideoSourceInterface* source) {
scoped_refptr<webrtc::VideoTrackInterface> track(
- new talk_base::RefCountedObject<MockWebRtcVideoTrack>(
+ new rtc::RefCountedObject<MockWebRtcVideoTrack>(
id, source));
return track;
}
@@ -496,11 +496,11 @@
const std::string& id,
cricket::VideoCapturer* capturer) {
scoped_refptr<MockVideoSource> source =
- new talk_base::RefCountedObject<MockVideoSource>();
+ new rtc::RefCountedObject<MockVideoSource>();
source->SetVideoCapturer(capturer);
return
- new talk_base::RefCountedObject<MockWebRtcVideoTrack>(id, source.get());
+ new rtc::RefCountedObject<MockWebRtcVideoTrack>(id, source.get());
}
SessionDescriptionInterface*

Powered by Google App Engine
This is Rietveld 408576698