| Index: talk/app/webrtc/peerconnectionfactory.cc
|
| diff --git a/talk/app/webrtc/peerconnectionfactory.cc b/talk/app/webrtc/peerconnectionfactory.cc
|
| index c329446319dd9c02f8b0814ddcbe9cce9ff5cf8b..1f359ad0c0d852b2ad5731cf9cf4af5bb4f40646 100644
|
| --- a/talk/app/webrtc/peerconnectionfactory.cc
|
| +++ b/talk/app/webrtc/peerconnectionfactory.cc
|
| @@ -152,6 +152,7 @@ PeerConnectionFactory::PeerConnectionFactory(
|
| PeerConnectionFactory::~PeerConnectionFactory() {
|
| RTC_DCHECK(signaling_thread_->IsCurrent());
|
| channel_manager_.reset(nullptr);
|
| + media_controller_.reset(nullptr);
|
| default_allocator_factory_ = nullptr;
|
|
|
| // Make sure |worker_thread_| and |signaling_thread_| outlive
|
| @@ -187,6 +188,9 @@ bool PeerConnectionFactory::Initialize() {
|
| return false;
|
| }
|
|
|
| + media_controller_.reset(MediaControllerInterface::Create(
|
| + worker_thread(), channel_manager_.get()));
|
| +
|
| dtls_identity_store_ = new RefCountedDtlsIdentityStore(
|
| signaling_thread_, worker_thread_);
|
|
|
| @@ -278,9 +282,9 @@ PeerConnectionFactory::CreateAudioTrack(const std::string& id,
|
| return AudioTrackProxy::Create(signaling_thread_, track);
|
| }
|
|
|
| -cricket::ChannelManager* PeerConnectionFactory::channel_manager() {
|
| - RTC_DCHECK(signaling_thread_->IsCurrent());
|
| - return channel_manager_.get();
|
| +webrtc::MediaControllerInterface* PeerConnectionFactory::media_controller()
|
| + const {
|
| + return media_controller_.get();
|
| }
|
|
|
| rtc::Thread* PeerConnectionFactory::signaling_thread() {
|
|
|