| Index: webrtc/api/webrtcsessiondescriptionfactory.cc
|
| diff --git a/webrtc/api/webrtcsessiondescriptionfactory.cc b/webrtc/api/webrtcsessiondescriptionfactory.cc
|
| index 3292f88370b4da20d275f6dc20d6c75be282e60a..65ee7ef128b86699cdfef66e295517ade9a6de63 100644
|
| --- a/webrtc/api/webrtcsessiondescriptionfactory.cc
|
| +++ b/webrtc/api/webrtcsessiondescriptionfactory.cc
|
| @@ -201,7 +201,7 @@ WebRtcSessionDescriptionFactory::WebRtcSessionDescriptionFactory(
|
| }
|
|
|
| WebRtcSessionDescriptionFactory::~WebRtcSessionDescriptionFactory() {
|
| - ASSERT(signaling_thread_->IsCurrent());
|
| + RTC_DCHECK(signaling_thread_->IsCurrent());
|
|
|
| // Fail any requests that were asked for before identity generation completed.
|
| FailPendingRequests(kFailedDueToSessionShutdown);
|
| @@ -249,8 +249,8 @@ void WebRtcSessionDescriptionFactory::CreateOffer(
|
| if (certificate_request_state_ == CERTIFICATE_WAITING) {
|
| create_session_description_requests_.push(request);
|
| } else {
|
| - ASSERT(certificate_request_state_ == CERTIFICATE_SUCCEEDED ||
|
| - certificate_request_state_ == CERTIFICATE_NOT_NEEDED);
|
| + RTC_DCHECK(certificate_request_state_ == CERTIFICATE_SUCCEEDED ||
|
| + certificate_request_state_ == CERTIFICATE_NOT_NEEDED);
|
| InternalCreateOffer(request);
|
| }
|
| }
|
| @@ -291,8 +291,8 @@ void WebRtcSessionDescriptionFactory::CreateAnswer(
|
| if (certificate_request_state_ == CERTIFICATE_WAITING) {
|
| create_session_description_requests_.push(request);
|
| } else {
|
| - ASSERT(certificate_request_state_ == CERTIFICATE_SUCCEEDED ||
|
| - certificate_request_state_ == CERTIFICATE_NOT_NEEDED);
|
| + RTC_DCHECK(certificate_request_state_ == CERTIFICATE_SUCCEEDED ||
|
| + certificate_request_state_ == CERTIFICATE_NOT_NEEDED);
|
| InternalCreateAnswer(request);
|
| }
|
| }
|
| @@ -364,7 +364,7 @@ void WebRtcSessionDescriptionFactory::InternalCreateOffer(
|
| // Just increase the version number by one each time when a new offer
|
| // is created regardless if it's identical to the previous one or not.
|
| // The |session_version_| is a uint64_t, the wrap around should not happen.
|
| - ASSERT(session_version_ + 1 > session_version_);
|
| + RTC_DCHECK(session_version_ + 1 > session_version_);
|
| JsepSessionDescription* offer(new JsepSessionDescription(
|
| JsepSessionDescription::kOffer));
|
| if (!offer->Initialize(desc, session_id_,
|
| @@ -422,7 +422,7 @@ void WebRtcSessionDescriptionFactory::InternalCreateAnswer(
|
| // unrelated to the version number in the o line of the offer.
|
| // Get a new version number by increasing the |session_version_answer_|.
|
| // The |session_version_| is a uint64_t, the wrap around should not happen.
|
| - ASSERT(session_version_ + 1 > session_version_);
|
| + RTC_DCHECK(session_version_ + 1 > session_version_);
|
| JsepSessionDescription* answer(new JsepSessionDescription(
|
| JsepSessionDescription::kAnswer));
|
| if (!answer->Initialize(desc, session_id_,
|
| @@ -448,7 +448,7 @@ void WebRtcSessionDescriptionFactory::InternalCreateAnswer(
|
|
|
| void WebRtcSessionDescriptionFactory::FailPendingRequests(
|
| const std::string& reason) {
|
| - ASSERT(signaling_thread_->IsCurrent());
|
| + RTC_DCHECK(signaling_thread_->IsCurrent());
|
| while (!create_session_description_requests_.empty()) {
|
| const CreateSessionDescriptionRequest& request =
|
| create_session_description_requests_.front();
|
| @@ -478,7 +478,7 @@ void WebRtcSessionDescriptionFactory::PostCreateSessionDescriptionSucceeded(
|
| }
|
|
|
| void WebRtcSessionDescriptionFactory::OnCertificateRequestFailed() {
|
| - ASSERT(signaling_thread_->IsCurrent());
|
| + RTC_DCHECK(signaling_thread_->IsCurrent());
|
|
|
| LOG(LS_ERROR) << "Asynchronous certificate generation request failed.";
|
| certificate_request_state_ = CERTIFICATE_FAILED;
|
|
|