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

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

Issue 10824143: Rolling libjingle r164. (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: Created 8 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/mock_peer_connection_impl.cc
===================================================================
--- content/renderer/media/mock_peer_connection_impl.cc (revision 149659)
+++ content/renderer/media/mock_peer_connection_impl.cc (working copy)
@@ -42,7 +42,6 @@
MockPeerConnectionImpl::MockPeerConnectionImpl(
MockMediaStreamDependencyFactory* factory)
: dependency_factory_(factory),
- stream_changes_committed_(false),
local_streams_(new talk_base::RefCountedObject<MockStreamCollection>),
remote_streams_(new talk_base::RefCountedObject<MockStreamCollection>),
hint_audio_(false),
@@ -54,15 +53,6 @@
MockPeerConnectionImpl::~MockPeerConnectionImpl() {}
-void MockPeerConnectionImpl::ProcessSignalingMessage(const std::string& msg) {
- signaling_message_ = msg;
-}
-
-bool MockPeerConnectionImpl::Send(const std::string& msg) {
- NOTIMPLEMENTED();
- return false;
-}
-
talk_base::scoped_refptr<StreamCollectionInterface>
MockPeerConnectionImpl::local_streams() {
return local_streams_;
@@ -88,43 +78,16 @@
return true;
}
-void MockPeerConnectionImpl::RemoveStream(LocalMediaStreamInterface* stream) {
- DCHECK_EQ(stream_label_, stream->label());
- stream_label_.clear();
-}
-
void MockPeerConnectionImpl::RemoveStream(
MediaStreamInterface* local_stream) {
DCHECK_EQ(stream_label_, local_stream->label());
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;
-}
-
-void MockPeerConnectionImpl::Close() {
- signaling_message_.clear();
- stream_label_.clear();
- stream_changes_committed_ = false;
-}
-
MockPeerConnectionImpl::ReadyState MockPeerConnectionImpl::ready_state() {
return ready_state_;
}
-MockPeerConnectionImpl::SdpState MockPeerConnectionImpl::sdp_state() {
- NOTIMPLEMENTED();
- return kSdpNew;
-}
-
bool MockPeerConnectionImpl::StartIce(IceOptions options) {
ice_options_ = options;
return true;
« no previous file with comments | « content/renderer/media/mock_peer_connection_impl.h ('k') | content/renderer/media/peer_connection_handler_jsep.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698