| Index: webrtc/api/webrtcsession.cc
|
| diff --git a/webrtc/api/webrtcsession.cc b/webrtc/api/webrtcsession.cc
|
| index c3ea1c837983a70857c3dc11018f944a99e6d02b..9adada31d4e39ac1b058b578c8821f23a78433db 100644
|
| --- a/webrtc/api/webrtcsession.cc
|
| +++ b/webrtc/api/webrtcsession.cc
|
| @@ -470,18 +470,19 @@ bool CheckForRemoteIceRestart(const SessionDescriptionInterface* old_desc,
|
| }
|
|
|
| WebRtcSession::WebRtcSession(webrtc::MediaControllerInterface* media_controller,
|
| - rtc::Thread* signaling_thread,
|
| + rtc::Thread* network_thread,
|
| rtc::Thread* worker_thread,
|
| + rtc::Thread* signaling_thread,
|
| cricket::PortAllocator* port_allocator)
|
| - : signaling_thread_(signaling_thread),
|
| - worker_thread_(worker_thread),
|
| + : worker_thread_(worker_thread),
|
| + signaling_thread_(signaling_thread),
|
| port_allocator_(port_allocator),
|
| // RFC 3264: The numeric value of the session id and version in the
|
| // o line MUST be representable with a "64 bit signed integer".
|
| // Due to this constraint session id |sid_| is max limited to LLONG_MAX.
|
| sid_(rtc::ToString(rtc::CreateRandomId64() & LLONG_MAX)),
|
| transport_controller_(new cricket::TransportController(signaling_thread,
|
| - worker_thread,
|
| + network_thread,
|
| port_allocator)),
|
| media_controller_(media_controller),
|
| channel_manager_(media_controller_->channel_manager()),
|
|
|