Replace cricket::ContentAction with webrtc::SdpType
Bug: webrtc:8613
Change-Id: I9bce2b9d8c8445d2fa1b9f60b06596a5621ebc2f
Reviewed-on: https://webrtc-review.googlesource.com/29460
Commit-Queue: Steve Anton <steveanton@webrtc.org>
Reviewed-by: Peter Thatcher <pthatcher@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#21130}diff --git a/pc/peerconnection.h b/pc/peerconnection.h
index 4c8983b..c2b743d 100644
--- a/pc/peerconnection.h
+++ b/pc/peerconnection.h
@@ -616,16 +616,15 @@
// Updates the error state, signaling if necessary.
void SetSessionError(SessionError error, const std::string& error_desc);
- RTCError UpdateSessionState(cricket::ContentAction action,
- cricket::ContentSource source);
+ RTCError UpdateSessionState(SdpType type, cricket::ContentSource source);
// Push the media parts of the local or remote session description
// down to all of the channels.
- RTCError PushdownMediaDescription(cricket::ContentAction action,
+ RTCError PushdownMediaDescription(SdpType type,
cricket::ContentSource source);
bool PushdownSctpParameters_n(cricket::ContentSource source);
RTCError PushdownTransportDescription(cricket::ContentSource source,
- cricket::ContentAction action);
+ SdpType type);
// Returns true and the TransportInfo of the given |content_name|
// from |description|. Returns false if it's not available.
@@ -705,13 +704,15 @@
RTCError ValidateSessionDescription(const SessionDescriptionInterface* sdesc,
cricket::ContentSource source);
- // Check if a call to SetLocalDescription is acceptable with |action|.
- bool ExpectSetLocalDescription(cricket::ContentAction action);
- // Check if a call to SetRemoteDescription is acceptable with |action|.
- bool ExpectSetRemoteDescription(cricket::ContentAction action);
+ // Check if a call to SetLocalDescription is acceptable with a session
+ // description of the given type.
+ bool ExpectSetLocalDescription(SdpType type);
+ // Check if a call to SetRemoteDescription is acceptable with a session
+ // description of the given type.
+ bool ExpectSetRemoteDescription(SdpType type);
// Verifies a=setup attribute as per RFC 5763.
bool ValidateDtlsSetupAttribute(const cricket::SessionDescription* desc,
- cricket::ContentAction action);
+ SdpType type);
// Returns true if we are ready to push down the remote candidate.
// |remote_desc| is the new remote description, or NULL if the current remote