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

Unified Diff: content/renderer/media/media_stream_dependency_factory.cc

Issue 12207107: Update libjingle 273:277. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 7 years, 10 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/media_stream_dependency_factory.cc
===================================================================
--- content/renderer/media/media_stream_dependency_factory.cc (revision 181693)
+++ content/renderer/media/media_stream_dependency_factory.cc (working copy)
@@ -373,7 +373,7 @@
scoped_refptr<webrtc::PeerConnectionInterface>
MediaStreamDependencyFactory::CreatePeerConnection(
- const webrtc::JsepInterface::IceServers& ice_servers,
+ const webrtc::PeerConnectionInterface::IceServers& ice_servers,
const webrtc::MediaConstraintsInterface* constraints,
WebKit::WebFrame* web_frame,
webrtc::PeerConnectionObserver* observer) {
@@ -481,9 +481,11 @@
}
webrtc::SessionDescriptionInterface*
-MediaStreamDependencyFactory::CreateSessionDescription(const std::string& type,
- const std::string& sdp) {
- return webrtc::CreateSessionDescription(type, sdp);
+MediaStreamDependencyFactory::CreateSessionDescription(
+ const std::string& type,
+ const std::string& sdp,
+ webrtc::SdpParseError* error) {
+ return webrtc::CreateSessionDescription(type, sdp, error);
}
webrtc::IceCandidateInterface* MediaStreamDependencyFactory::CreateIceCandidate(

Powered by Google App Engine
This is Rietveld 408576698