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

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

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.h
===================================================================
--- content/renderer/media/mock_peer_connection_impl.h (revision 149659)
+++ content/renderer/media/mock_peer_connection_impl.h (working copy)
@@ -23,8 +23,6 @@
explicit MockPeerConnectionImpl(MockMediaStreamDependencyFactory* factory);
// PeerConnectionInterface implementation.
- virtual void ProcessSignalingMessage(const std::string& msg) OVERRIDE;
- virtual bool Send(const std::string& msg) OVERRIDE;
virtual talk_base::scoped_refptr<StreamCollectionInterface>
local_streams() OVERRIDE;
virtual talk_base::scoped_refptr<StreamCollectionInterface>
@@ -32,13 +30,8 @@
virtual void AddStream(LocalMediaStreamInterface* stream) OVERRIDE;
virtual bool AddStream(MediaStreamInterface* local_stream,
const MediaConstraintsInterface* constraints) OVERRIDE;
- virtual void RemoveStream(LocalMediaStreamInterface* stream) OVERRIDE;
virtual void RemoveStream(MediaStreamInterface* local_stream) OVERRIDE;
- virtual bool RemoveStream(const std::string& label) OVERRIDE;
- virtual void CommitStreamChanges() OVERRIDE;
- virtual void Close() OVERRIDE;
virtual ReadyState ready_state() OVERRIDE;
- virtual SdpState sdp_state() OVERRIDE;
virtual bool StartIce(IceOptions options) OVERRIDE;
virtual webrtc::SessionDescriptionInterface* CreateOffer(
@@ -76,12 +69,9 @@
virtual IceState ice_state() OVERRIDE;
void AddRemoteStream(MediaStreamInterface* stream);
- void ClearStreamChangesCommitted() { stream_changes_committed_ = false; }
void SetReadyState(ReadyState state) { ready_state_ = state; }
- const std::string& signaling_message() const { return signaling_message_; }
const std::string& stream_label() const { return stream_label_; }
- bool stream_changes_committed() const { return stream_changes_committed_; }
bool hint_audio() const { return hint_audio_; }
bool hint_video() const { return hint_video_; }
Action action() const { return action_; }
@@ -100,9 +90,7 @@
// Used for creating MockSessionDescription.
MockMediaStreamDependencyFactory* dependency_factory_;
- std::string signaling_message_;
std::string stream_label_;
- bool stream_changes_committed_;
talk_base::scoped_refptr<MockStreamCollection> local_streams_;
talk_base::scoped_refptr<MockStreamCollection> remote_streams_;
scoped_ptr<webrtc::SessionDescriptionInterface> local_desc_;
« no previous file with comments | « content/renderer/media/mock_media_stream_dependency_factory.cc ('k') | content/renderer/media/mock_peer_connection_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698