| 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(
|
|
|