Allow WebRtcMediaEngine to be created from any thread.

webrtc/pc/peerconnectionfactory.cc

 /*
  *  Copyright 2004 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 192 matching lines @@
   if (!default_network_manager_) {
     return false;
   }
 
   default_socket_factory_.reset(
       new rtc::BasicPacketSocketFactory(network_thread_));
   if (!default_socket_factory_) {
     return false;
   }
 
-  std::unique_ptr<cricket::MediaEngineInterface> media_engine =
-      worker_thread_->Invoke<std::unique_ptr<cricket::MediaEngineInterface>>(
-          RTC_FROM_HERE,
-          rtc::Bind(&PeerConnectionFactory::CreateMediaEngine_w, this));
+  std::unique_ptr<cricket::MediaEngineInterface> media_engine(
+      cricket::WebRtcMediaEngineFactory::Create(
+          default_adm_.get(), audio_encoder_factory_, audio_decoder_factory_,
+          video_encoder_factory_.get(), video_decoder_factory_.get(),
+          external_audio_mixer_));
 
   channel_manager_.reset(new cricket::ChannelManager(
       std::move(media_engine), worker_thread_, network_thread_));
 
   channel_manager_->SetVideoRtxEnabled(true);
   if (!channel_manager_->Init()) {
     return false;
   }
 
   return true;
@@ skipping 148 matching lines @@
 
 rtc::Thread* PeerConnectionFactory::worker_thread() {
   RTC_DCHECK(signaling_thread_->IsCurrent());
   return worker_thread_;
 }
 
 rtc::Thread* PeerConnectionFactory::network_thread() {
   return network_thread_;
 }
 
-std::unique_ptr<cricket::MediaEngineInterface>
-PeerConnectionFactory::CreateMediaEngine_w() {
-  RTC_DCHECK(worker_thread_ == rtc::Thread::Current());
-  return std::unique_ptr<cricket::MediaEngineInterface>(
-      cricket::WebRtcMediaEngineFactory::Create(
-          default_adm_.get(), audio_encoder_factory_,
-          audio_decoder_factory_,
-          video_encoder_factory_.get(), video_decoder_factory_.get(),
-          external_audio_mixer_));
-}
-
 }  // namespace webrtc