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

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

Issue 10038009: Revert 131949 (multiple memory leaks) - Adding JSEP PeerConnection glue. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 8 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 131960)
+++ content/renderer/media/mock_peer_connection_impl.h (working copy)
@@ -11,15 +11,13 @@
#include "base/compiler_specific.h"
#include "third_party/libjingle/source/talk/app/webrtc/peerconnection.h"
-class MockMediaStreamDependencyFactory;
-
namespace webrtc {
class MockStreamCollection;
class MockPeerConnectionImpl : public PeerConnectionInterface {
public:
- MockPeerConnectionImpl(MockMediaStreamDependencyFactory* factory);
+ MockPeerConnectionImpl();
// PeerConnectionInterface implementation.
virtual void ProcessSignalingMessage(const std::string& msg) OVERRIDE;
@@ -56,41 +54,20 @@
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_; }
- const std::string& description_sdp() const { return description_sdp_; }
- IceOptions ice_options() const { return ice_options_; }
- const std::string& ice_label() const { return ice_label_; }
- const std::string& ice_sdp() const { return ice_sdp_; }
- static const char kDummyOffer[];
-
protected:
virtual ~MockPeerConnectionImpl();
private:
- // 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_;
- bool hint_audio_;
- bool hint_video_;
- Action action_;
- std::string description_sdp_;
- IceOptions ice_options_;
- std::string ice_label_;
- std::string ice_sdp_;
- ReadyState ready_state_;
DISALLOW_COPY_AND_ASSIGN(MockPeerConnectionImpl);
};
« no previous file with comments | « content/renderer/media/mock_media_stream_impl.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