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

Unified Diff: content/renderer/media/mock_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/mock_media_stream_dependency_factory.cc
===================================================================
--- content/renderer/media/mock_media_stream_dependency_factory.cc (revision 181693)
+++ content/renderer/media/mock_media_stream_dependency_factory.cc (working copy)
@@ -207,6 +207,11 @@
return state_;
}
+const cricket::VideoOptions* MockVideoSource::options() const {
+ NOTIMPLEMENTED();
+ return NULL;
+}
+
MockLocalVideoTrack::MockLocalVideoTrack(std::string id,
webrtc::VideoSourceInterface* source)
: enabled_(false),
@@ -470,8 +475,9 @@
SessionDescriptionInterface*
MockMediaStreamDependencyFactory::CreateSessionDescription(
- const std::string& type,
- const std::string& sdp) {
+ const std::string& type,
+ const std::string& sdp,
+ webrtc::SdpParseError* error) {
return new MockSessionDescription(type, sdp);
}
« no previous file with comments | « content/renderer/media/mock_media_stream_dependency_factory.h ('k') | content/renderer/media/mock_peer_connection_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698