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

Unified Diff: content/renderer/media/mock_web_rtc_peer_connection_handler_client.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
Index: content/renderer/media/mock_web_rtc_peer_connection_handler_client.h
diff --git a/content/renderer/media/mock_web_rtc_peer_connection_handler_client.h b/content/renderer/media/mock_web_rtc_peer_connection_handler_client.h
index 99ee958498cc24909bacb743ebc959229830c2e3..39f0f63a5ec1f0decdbb2711a3c9a8887115d9a8 100644
--- a/content/renderer/media/mock_web_rtc_peer_connection_handler_client.h
+++ b/content/renderer/media/mock_web_rtc_peer_connection_handler_client.h
@@ -25,8 +25,9 @@ class MockWebRTCPeerConnectionHandlerClient
virtual void negotiationNeeded() OVERRIDE;
virtual void didGenerateICECandidate(
const WebKit::WebRTCICECandidate& candidate) OVERRIDE;
- virtual void didChangeSignalingState(SignalingState) OVERRIDE;
- virtual void didChangeICEState(ICEState) OVERRIDE;
+ virtual void didChangeSignalingState(SignalingState state) OVERRIDE;
+ virtual void didChangeICEGatheringState(ICEGatheringState state) OVERRIDE;
+ virtual void didChangeICEConnectionState(ICEConnectionState state) OVERRIDE;
virtual void didAddRemoteStream(
const WebKit::WebMediaStream& stream_descriptor) OVERRIDE;
virtual void didRemoveRemoteStream(
@@ -40,14 +41,20 @@ class MockWebRTCPeerConnectionHandlerClient
}
const std::string& candidate_mid() const { return candidate_mid_ ; }
SignalingState signaling_state() const { return signaling_state_; }
- ICEState ice_state() const { return ice_state_; }
+ ICEConnectionState ice_connection_state() const {
+ return ice_connection_state_;
+ }
+ ICEGatheringState ice_gathering_state() const {
+ return ice_gathering_state_;
+ }
const std::string& stream_label() const { return stream_label_; }
private:
bool renegotiate_;
std::string stream_label_;
SignalingState signaling_state_;
- ICEState ice_state_;
+ ICEConnectionState ice_connection_state_;
+ ICEGatheringState ice_gathering_state_;
std::string candidate_sdp_;
int candidate_mline_index_;
std::string candidate_mid_;

Powered by Google App Engine
This is Rietveld 408576698