| Index: talk/app/webrtc/peerconnectionfactory.cc
|
| diff --git a/talk/app/webrtc/peerconnectionfactory.cc b/talk/app/webrtc/peerconnectionfactory.cc
|
| index 08877546c4d6ba8a9007c913b941f2af4b00d217..6619f3101d6eaabd62fe1d5a074e07b240a59799 100644
|
| --- a/talk/app/webrtc/peerconnectionfactory.cc
|
| +++ b/talk/app/webrtc/peerconnectionfactory.cc
|
| @@ -279,9 +279,11 @@ PeerConnectionFactory::CreateAudioTrack(const std::string& id,
|
| return AudioTrackProxy::Create(signaling_thread_, track);
|
| }
|
|
|
| -cricket::ChannelManager* PeerConnectionFactory::channel_manager() {
|
| +webrtc::MediaControllerInterface* PeerConnectionFactory::CreateMediaController()
|
| + const {
|
| RTC_DCHECK(signaling_thread_->IsCurrent());
|
| - return channel_manager_.get();
|
| + return MediaControllerInterface::Create(worker_thread_,
|
| + channel_manager_.get());
|
| }
|
|
|
| rtc::Thread* PeerConnectionFactory::signaling_thread() {
|
|
|