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

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

Issue 12210111: Hookup new ice state callbacks OnIceConnectionChange and OnIceGatheringChange from PeerConnectionOb… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge with latest code base. 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
« no previous file with comments | « no previous file | content/renderer/media/mock_peer_connection_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/media/mock_peer_connection_impl.h
diff --git a/content/renderer/media/mock_peer_connection_impl.h b/content/renderer/media/mock_peer_connection_impl.h
index 95a50f638b2e8b27773bd94949e47651f2ddb47e..a055fccf9041c76ac2c0059bbc6b05354ecbd405 100644
--- a/content/renderer/media/mock_peer_connection_impl.h
+++ b/content/renderer/media/mock_peer_connection_impl.h
@@ -40,8 +40,26 @@ class MockPeerConnectionImpl : public webrtc::PeerConnectionInterface {
virtual bool GetStats(webrtc::StatsObserver* observer,
webrtc::MediaStreamTrackInterface* track) OVERRIDE;
- virtual ReadyState ready_state() OVERRIDE;
- virtual SignalingState signaling_state() OVERRIDE;
+ virtual ReadyState ready_state() OVERRIDE {
+ NOTIMPLEMENTED();
+ return PeerConnectionInterface::kStable;
+ }
+ virtual SignalingState signaling_state() OVERRIDE {
+ NOTIMPLEMENTED();
+ return PeerConnectionInterface::kStable;
+ }
+ virtual IceState ice_state() OVERRIDE {
+ NOTIMPLEMENTED();
+ return PeerConnectionInterface::kIceNew;
+ }
+ virtual IceConnectionState ice_connection_state() OVERRIDE {
+ NOTIMPLEMENTED();
+ return PeerConnectionInterface::kIceConnectionNew;
+ }
+ virtual IceGatheringState ice_gathering_state() OVERRIDE {
+ NOTIMPLEMENTED();
+ return PeerConnectionInterface::kIceGatheringNew;
+ }
virtual const webrtc::SessionDescriptionInterface* local_description()
const OVERRIDE;
@@ -69,13 +87,8 @@ class MockPeerConnectionImpl : public webrtc::PeerConnectionInterface {
const webrtc::MediaConstraintsInterface* constraints) OVERRIDE;
virtual bool AddIceCandidate(
const webrtc::IceCandidateInterface* candidate) OVERRIDE;
- virtual IceState ice_state() OVERRIDE;
- virtual IceConnectionState ice_connection_state() OVERRIDE;
- virtual IceGatheringState ice_gathering_state() OVERRIDE;
void AddRemoteStream(webrtc::MediaStreamInterface* stream);
- void SetSignalingState(SignalingState state) { signaling_state_ = state; }
- void SetIceState(IceState state) { ice_state_ = state; }
const std::string& stream_label() const { return stream_label_; }
bool hint_audio() const { return hint_audio_; }
@@ -109,8 +122,6 @@ class MockPeerConnectionImpl : public webrtc::PeerConnectionInterface {
std::string sdp_mid_;
int sdp_mline_index_;
std::string ice_sdp_;
- SignalingState signaling_state_;
- IceState ice_state_;
DISALLOW_COPY_AND_ASSIGN(MockPeerConnectionImpl);
};
« no previous file with comments | « no previous file | content/renderer/media/mock_peer_connection_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698