diff --git a/media/base/mediaengine.cc b/media/base/mediaengine.cc index 281ddbb76f..93d72c2e34 100644 --- a/media/base/mediaengine.cc +++ b/media/base/mediaengine.cc @@ -10,24 +10,6 @@ #include "media/base/mediaengine.h" -#if !defined(DISABLE_MEDIA_ENGINE_FACTORY) - -namespace cricket { - -MediaEngineFactory::MediaEngineCreateFunction - MediaEngineFactory::create_function_ = NULL; - -MediaEngineFactory::MediaEngineCreateFunction - MediaEngineFactory::SetCreateFunction(MediaEngineCreateFunction function) { - MediaEngineCreateFunction old_function = create_function_; - create_function_ = function; - return old_function; -} - -}; // namespace cricket - -#endif // DISABLE_MEDIA_ENGINE_FACTORY - namespace cricket { webrtc::RtpParameters CreateRtpParametersWithOneEncoding() { diff --git a/media/base/mediaengine.h b/media/base/mediaengine.h index 483a96b7e8..fcb4ad97b7 100644 --- a/media/base/mediaengine.h +++ b/media/base/mediaengine.h @@ -29,10 +29,6 @@ #include "media/base/videocommon.h" #include "rtc_base/platform_file.h" -#if defined(GOOGLE_CHROME_BUILD) || defined(CHROMIUM_BUILD) -#define DISABLE_MEDIA_ENGINE_FACTORY -#endif - namespace webrtc { class AudioDeviceModule; class AudioMixer; @@ -91,24 +87,6 @@ class MediaEngineInterface { }; -#if !defined(DISABLE_MEDIA_ENGINE_FACTORY) -class MediaEngineFactory { - public: - typedef cricket::MediaEngineInterface* (*MediaEngineCreateFunction)(); - // Creates a media engine, using either the compiled system default or the - // creation function specified in SetCreateFunction, if specified. - static MediaEngineInterface* Create(); - // Sets the function used when calling Create. If unset, the compiled system - // default will be used. Returns the old create function, or NULL if one - // wasn't set. Likewise, NULL can be used as the |function| parameter to - // reset to the default behavior. - static MediaEngineCreateFunction SetCreateFunction( - MediaEngineCreateFunction function); - private: - static MediaEngineCreateFunction create_function_; -}; -#endif - // CompositeMediaEngine constructs a MediaEngine from separate // voice and video engine classes. template