diff --git a/talk/media/webrtc/webrtcvideoengine.cc b/talk/media/webrtc/webrtcvideoengine.cc index 49e0c52b6..c48f15f00 100644 --- a/talk/media/webrtc/webrtcvideoengine.cc +++ b/talk/media/webrtc/webrtcvideoengine.cc @@ -62,44 +62,6 @@ #include "talk/media/webrtc/webrtcvoiceengine.h" #include "webrtc/experiments.h" #include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h" -#ifdef WEBRTC_CHROMIUM_BUILD -#include "webrtc/system_wrappers/interface/field_trial.h" -#endif - -#if !defined(LIBPEERCONNECTION_LIB) -#include "talk/media/webrtc/webrtcmediaengine.h" - -WRME_EXPORT -cricket::MediaEngineInterface* CreateWebRtcMediaEngine( - webrtc::AudioDeviceModule* adm, webrtc::AudioDeviceModule* adm_sc, - cricket::WebRtcVideoEncoderFactory* encoder_factory, - cricket::WebRtcVideoDecoderFactory* decoder_factory) { -#ifdef WEBRTC_CHROMIUM_BUILD - if (webrtc::field_trial::FindFullName("WebRTC-NewVideoAPI") == "Enabled") { - return new cricket::WebRtcMediaEngine2( - adm, adm_sc, encoder_factory, decoder_factory); - } else { -#endif - return new cricket::WebRtcMediaEngine( - adm, adm_sc, encoder_factory, decoder_factory); -#ifdef WEBRTC_CHROMIUM_BUILD - } -#endif -} - -WRME_EXPORT -void DestroyWebRtcMediaEngine(cricket::MediaEngineInterface* media_engine) { -#ifdef WEBRTC_CHROMIUM_BUILD - if (webrtc::field_trial::FindFullName("WebRTC-NewVideoAPI") == "Enabled") { - delete static_cast(media_engine); - } else { -#endif - delete static_cast(media_engine); -#ifdef WEBRTC_CHROMIUM_BUILD - } -#endif -} -#endif namespace cricket {