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

Unified Diff: talk/app/webrtc/webrtcsessiondescriptionfactory.cc

Issue 1246913005: TransportController refactoring (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: More renaming, formatting and other polish Created 5 years, 4 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: talk/app/webrtc/webrtcsessiondescriptionfactory.cc
diff --git a/talk/app/webrtc/webrtcsessiondescriptionfactory.cc b/talk/app/webrtc/webrtcsessiondescriptionfactory.cc
index 41bcfa0593688b0911a6d53f53cfdc0206d04288..a7784e3cdb37a37d58e3ed98b83eacd266379323 100644
--- a/talk/app/webrtc/webrtcsessiondescriptionfactory.cc
+++ b/talk/app/webrtc/webrtcsessiondescriptionfactory.cc
@@ -165,9 +165,15 @@ WebRtcSessionDescriptionFactory::WebRtcSessionDescriptionFactory(
WebRtcSession* session,
const std::string& session_id,
cricket::DataChannelType dct)
- : WebRtcSessionDescriptionFactory(
- signaling_thread, channel_manager, mediastream_signaling, nullptr,
- nullptr, session, session_id, dct, false) {
+ : WebRtcSessionDescriptionFactory(signaling_thread,
+ channel_manager,
+ mediastream_signaling,
+ nullptr,
+ nullptr,
+ session,
+ session_id,
+ dct,
+ false) {
LOG(LS_VERBOSE) << "DTLS-SRTP disabled.";
}
@@ -180,15 +186,15 @@ WebRtcSessionDescriptionFactory::WebRtcSessionDescriptionFactory(
const std::string& session_id,
cricket::DataChannelType dct)
: WebRtcSessionDescriptionFactory(
- signaling_thread,
- channel_manager,
- mediastream_signaling,
- dtls_identity_store.Pass(),
- new rtc::RefCountedObject<WebRtcIdentityRequestObserver>(),
- session,
- session_id,
- dct,
- true) {
+ signaling_thread,
+ channel_manager,
+ mediastream_signaling,
+ dtls_identity_store.Pass(),
+ new rtc::RefCountedObject<WebRtcIdentityRequestObserver>(),
+ session,
+ session_id,
+ dct,
+ true) {
DCHECK(dtls_identity_store_);
certificate_request_state_ = CERTIFICATE_WAITING;
@@ -215,9 +221,15 @@ WebRtcSessionDescriptionFactory::WebRtcSessionDescriptionFactory(
WebRtcSession* session,
const std::string& session_id,
cricket::DataChannelType dct)
- : WebRtcSessionDescriptionFactory(
- signaling_thread, channel_manager, mediastream_signaling, nullptr,
- nullptr, session, session_id, dct, true) {
+ : WebRtcSessionDescriptionFactory(signaling_thread,
+ channel_manager,
+ mediastream_signaling,
+ nullptr,
+ nullptr,
+ session,
+ session_id,
+ dct,
+ true) {
DCHECK(certificate);
certificate_request_state_ = CERTIFICATE_WAITING;
@@ -226,9 +238,9 @@ WebRtcSessionDescriptionFactory::WebRtcSessionDescriptionFactory(
// We already have a certificate but we wait to do SetIdentity; if we do
// it in the constructor then the caller has not had a chance to connect to
// SignalIdentityReady.
- signaling_thread_->Post(this, MSG_USE_CONSTRUCTOR_CERTIFICATE,
- new rtc::ScopedRefMessageData<rtc::RTCCertificate>(
- certificate));
+ signaling_thread_->Post(
+ this, MSG_USE_CONSTRUCTOR_CERTIFICATE,
+ new rtc::ScopedRefMessageData<rtc::RTCCertificate>(certificate));
}
WebRtcSessionDescriptionFactory::~WebRtcSessionDescriptionFactory() {
@@ -254,8 +266,6 @@ WebRtcSessionDescriptionFactory::~WebRtcSessionDescriptionFactory() {
delete msg.pdata;
}
}
-
- transport_desc_factory_.set_identity(NULL);
}
void WebRtcSessionDescriptionFactory::CreateOffer(

Powered by Google App Engine
This is Rietveld 408576698