| Index: webrtc/pc/peerconnectionfactory.cc
|
| diff --git a/webrtc/pc/peerconnectionfactory.cc b/webrtc/pc/peerconnectionfactory.cc
|
| index f9e6dced50b409e5fa240672567fc41e2afa5103..37787513375037ecae5ed169a5e27e7a3a18c601 100644
|
| --- a/webrtc/pc/peerconnectionfactory.cc
|
| +++ b/webrtc/pc/peerconnectionfactory.cc
|
| @@ -354,14 +354,6 @@ PeerConnectionFactory::CreateAudioTrack(const std::string& id,
|
| return AudioTrackProxy::Create(signaling_thread_, track);
|
| }
|
|
|
| -webrtc::MediaControllerInterface* PeerConnectionFactory::CreateMediaController(
|
| - const cricket::MediaConfig& config,
|
| - webrtc::RtcEventLog* event_log) const {
|
| - RTC_DCHECK(signaling_thread_->IsCurrent());
|
| - return MediaControllerInterface::Create(config, worker_thread_,
|
| - channel_manager_.get(), event_log);
|
| -}
|
| -
|
| cricket::TransportController* PeerConnectionFactory::CreateTransportController(
|
| cricket::PortAllocator* port_allocator,
|
| bool redetermine_role_on_ice_restart) {
|
| @@ -371,6 +363,10 @@ cricket::TransportController* PeerConnectionFactory::CreateTransportController(
|
| redetermine_role_on_ice_restart, options_.crypto_options);
|
| }
|
|
|
| +cricket::ChannelManager* PeerConnectionFactory::channel_manager() {
|
| + return channel_manager_.get();
|
| +}
|
| +
|
| rtc::Thread* PeerConnectionFactory::signaling_thread() {
|
| // This method can be called on a different thread when the factory is
|
| // created in CreatePeerConnectionFactory().
|
|
|