Reland of: Separating SCTP code from BaseChannel/MediaChannel.

webrtc/api/webrtcsessiondescriptionfactory.cc

 /*
  *  Copyright 2013 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 382 matching lines @@
     for (const cricket::ContentInfo& content :
          session_->remote_description()->description()->contents()) {
       // According to http://tools.ietf.org/html/rfc5245#section-9.2.1.1
       // an answer should also contain new ICE ufrag and password if an offer
       // has been received with new ufrag and password.
       request.options.transport_options[content.name].ice_restart =
           session_->IceRestartPending(content.name);
       // We should pass the current SSL role to the transport description
       // factory, if there is already an existing ongoing session.
       rtc::SSLRole ssl_role;
-      if (session_->GetSslRole(session_->GetChannel(content.name), &ssl_role)) {
+      if (session_->GetSslRole(content.name, &ssl_role)) {
         request.options.transport_options[content.name].prefer_passive_role =
             (rtc::SSL_SERVER == ssl_role);
       }
     }
   }
 
   cricket::SessionDescription* desc(session_desc_factory_.CreateAnswer(
       session_->remote_description()
           ? session_->remote_description()->description()
           : nullptr,
@@ skipping 86 matching lines @@
     if (create_session_description_requests_.front().type ==
         CreateSessionDescriptionRequest::kOffer) {
       InternalCreateOffer(create_session_description_requests_.front());
     } else {
       InternalCreateAnswer(create_session_description_requests_.front());
     }
     create_session_description_requests_.pop();
   }
 }
 }  // namespace webrtc