From 8bb746373531af59d55280eda9f890cf26a0bbf0 Mon Sep 17 00:00:00 2001 From: "sergeyu@chromium.org" Date: Thu, 26 Apr 2012 04:20:12 +0000 Subject: Roll libjingle 132:135 Review URL: https://chromiumcodereview.appspot.com/10209008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@134065 0039d316-1c4b-4281-b951-d872f2087c98 --- content/renderer/media/mock_media_stream_dependency_factory.cc | 8 ++++++++ content/renderer/media/mock_peer_connection_impl.cc | 7 +++++++ content/renderer/media/mock_peer_connection_impl.h | 1 + 3 files changed, 16 insertions(+) (limited to 'content/renderer/media') diff --git a/content/renderer/media/mock_media_stream_dependency_factory.cc b/content/renderer/media/mock_media_stream_dependency_factory.cc index 7d54d11..05ea585 100644 --- a/content/renderer/media/mock_media_stream_dependency_factory.cc +++ b/content/renderer/media/mock_media_stream_dependency_factory.cc @@ -133,6 +133,14 @@ class MockSessionDescription : public SessionDescriptionInterface { NOTIMPLEMENTED(); return NULL; } + virtual std::string session_id() const OVERRIDE { + NOTIMPLEMENTED(); + return ""; + } + virtual std::string session_version() const OVERRIDE { + NOTIMPLEMENTED(); + return ""; + } virtual bool AddCandidate(const IceCandidateInterface* candidate) OVERRIDE { NOTIMPLEMENTED(); return false; diff --git a/content/renderer/media/mock_peer_connection_impl.cc b/content/renderer/media/mock_peer_connection_impl.cc index 2b893ba..f0eb845 100644 --- a/content/renderer/media/mock_peer_connection_impl.cc +++ b/content/renderer/media/mock_peer_connection_impl.cc @@ -84,6 +84,13 @@ void MockPeerConnectionImpl::RemoveStream(LocalMediaStreamInterface* stream) { stream_label_.clear(); } +bool MockPeerConnectionImpl::RemoveStream(const std::string& label) { + if (stream_label_ != label) + return false; + stream_label_.clear(); + return true; +} + void MockPeerConnectionImpl::CommitStreamChanges() { stream_changes_committed_ = true; } diff --git a/content/renderer/media/mock_peer_connection_impl.h b/content/renderer/media/mock_peer_connection_impl.h index a5e85a1..62b7b31 100644 --- a/content/renderer/media/mock_peer_connection_impl.h +++ b/content/renderer/media/mock_peer_connection_impl.h @@ -30,6 +30,7 @@ class MockPeerConnectionImpl : public PeerConnectionInterface { remote_streams() OVERRIDE; virtual void AddStream(LocalMediaStreamInterface* stream) OVERRIDE; virtual void RemoveStream(LocalMediaStreamInterface* stream) OVERRIDE; + virtual bool RemoveStream(const std::string& label) OVERRIDE; virtual void CommitStreamChanges() OVERRIDE; virtual void Close() OVERRIDE; virtual ReadyState ready_state() OVERRIDE; -- cgit v1.1