| Index: webrtc/pc/peerconnectionfactory.cc
|
| diff --git a/webrtc/pc/peerconnectionfactory.cc b/webrtc/pc/peerconnectionfactory.cc
|
| index 6da4669773dc597f77be92c1a5a07c626ae3066d..d4ee405f1a3e55d0c9d6205510b4e831e94c9cea 100644
|
| --- a/webrtc/pc/peerconnectionfactory.cc
|
| +++ b/webrtc/pc/peerconnectionfactory.cc
|
| @@ -262,9 +262,8 @@
|
| allocator.get(), options_.network_ignore_mask));
|
|
|
| std::unique_ptr<RtcEventLog> event_log =
|
| - worker_thread_->Invoke<std::unique_ptr<RtcEventLog>>(
|
| - RTC_FROM_HERE,
|
| - rtc::Bind(&PeerConnectionFactory::CreateRtcEventLog_w, this));
|
| + event_log_factory_ ? event_log_factory_->CreateRtcEventLog()
|
| + : rtc::MakeUnique<RtcEventLogNullImpl>();
|
|
|
| std::unique_ptr<Call> call = worker_thread_->Invoke<std::unique_ptr<Call>>(
|
| RTC_FROM_HERE,
|
| @@ -330,11 +329,6 @@
|
|
|
| rtc::Thread* PeerConnectionFactory::network_thread() {
|
| return network_thread_;
|
| -}
|
| -
|
| -std::unique_ptr<RtcEventLog> PeerConnectionFactory::CreateRtcEventLog_w() {
|
| - return event_log_factory_ ? event_log_factory_->CreateRtcEventLog()
|
| - : rtc::MakeUnique<RtcEventLogNullImpl>();
|
| }
|
|
|
| std::unique_ptr<Call> PeerConnectionFactory::CreateCall_w(
|
|
|