diff --git a/talk/media/webrtc/webrtcmediaengine.h b/talk/media/webrtc/webrtcmediaengine.h
index efca26c08b..a8ea87797a 100644
--- a/talk/media/webrtc/webrtcmediaengine.h
+++ b/talk/media/webrtc/webrtcmediaengine.h
@@ -62,135 +62,6 @@ class WebRtcMediaEngineFactory {
   static MediaEngineInterface* Create();
   static MediaEngineInterface* Create(
       webrtc::AudioDeviceModule* adm,
-      webrtc::AudioDeviceModule* adm_sc,
-      cricket::WebRtcVideoEncoderFactory* encoder_factory,
-      cricket::WebRtcVideoDecoderFactory* decoder_factory)
-      : delegate_(CreateWebRtcMediaEngine(
-          adm, adm_sc, encoder_factory, decoder_factory)) {
-  }
-  virtual ~WebRtcMediaEngine() {
-    DestroyWebRtcMediaEngine(delegate_);
-  }
-  virtual bool Init(rtc::Thread* worker_thread) OVERRIDE {
-    return delegate_->Init(worker_thread);
-  }
-  virtual void Terminate() OVERRIDE {
-    delegate_->Terminate();
-  }
-  virtual int GetCapabilities() OVERRIDE {
-    return delegate_->GetCapabilities();
-  }
-  virtual VoiceMediaChannel* CreateChannel() OVERRIDE {
-    return delegate_->CreateChannel();
-  }
-  virtual VideoMediaChannel* CreateVideoChannel(
-      VoiceMediaChannel* voice_media_channel) OVERRIDE {
-    return delegate_->CreateVideoChannel(voice_media_channel);
-  }
-  virtual SoundclipMedia* CreateSoundclip() OVERRIDE {
-    return delegate_->CreateSoundclip();
-  }
-  virtual AudioOptions GetAudioOptions() const OVERRIDE {
-    return delegate_->GetAudioOptions();
-  }
-  virtual bool SetAudioOptions(const AudioOptions& options) OVERRIDE {
-    return delegate_->SetAudioOptions(options);
-  }
-  virtual bool SetVideoOptions(const VideoOptions& options) OVERRIDE {
-    return delegate_->SetVideoOptions(options);
-  }
-  virtual bool SetAudioDelayOffset(int offset) OVERRIDE {
-    return delegate_->SetAudioDelayOffset(offset);
-  }
-  virtual bool SetDefaultVideoEncoderConfig(
-      const VideoEncoderConfig& config) OVERRIDE {
-    return delegate_->SetDefaultVideoEncoderConfig(config);
-  }
-  virtual VideoEncoderConfig GetDefaultVideoEncoderConfig() const OVERRIDE {
-    return delegate_->GetDefaultVideoEncoderConfig();
-  }
-  virtual bool SetSoundDevices(
-      const Device* in_device, const Device* out_device) OVERRIDE {
-    return delegate_->SetSoundDevices(in_device, out_device);
-  }
-  virtual bool GetOutputVolume(int* level) OVERRIDE {
-    return delegate_->GetOutputVolume(level);
-  }
-  virtual bool SetOutputVolume(int level) OVERRIDE {
-    return delegate_->SetOutputVolume(level);
-  }
-  virtual int GetInputLevel() OVERRIDE {
-    return delegate_->GetInputLevel();
-  }
-  virtual bool SetLocalMonitor(bool enable) OVERRIDE {
-    return delegate_->SetLocalMonitor(enable);
-  }
-  virtual bool SetLocalRenderer(VideoRenderer* renderer) OVERRIDE {
-    return delegate_->SetLocalRenderer(renderer);
-  }
-  virtual const std::vector<AudioCodec>& audio_codecs() OVERRIDE {
-    return delegate_->audio_codecs();
-  }
-  virtual const std::vector<RtpHeaderExtension>&
-      audio_rtp_header_extensions() OVERRIDE {
-    return delegate_->audio_rtp_header_extensions();
-  }
-  virtual const std::vector<VideoCodec>& video_codecs() OVERRIDE {
-    return delegate_->video_codecs();
-  }
-  virtual const std::vector<RtpHeaderExtension>&
-      video_rtp_header_extensions() OVERRIDE {
-    return delegate_->video_rtp_header_extensions();
-  }
-  virtual void SetVoiceLogging(int min_sev, const char* filter) OVERRIDE {
-    delegate_->SetVoiceLogging(min_sev, filter);
-  }
-  virtual void SetVideoLogging(int min_sev, const char* filter) OVERRIDE {
-    delegate_->SetVideoLogging(min_sev, filter);
-  }
-  virtual bool StartAecDump(rtc::PlatformFile file) OVERRIDE {
-    return delegate_->StartAecDump(file);
-  }
-  virtual bool RegisterVoiceProcessor(
-      uint32 ssrc, VoiceProcessor* video_processor,
-      MediaProcessorDirection direction) OVERRIDE {
-    return delegate_->RegisterVoiceProcessor(ssrc, video_processor, direction);
-  }
-  virtual bool UnregisterVoiceProcessor(
-      uint32 ssrc, VoiceProcessor* video_processor,
-      MediaProcessorDirection direction) OVERRIDE {
-    return delegate_->UnregisterVoiceProcessor(ssrc, video_processor,
-        direction);
-  }
-  virtual VideoFormat GetStartCaptureFormat() const OVERRIDE {
-    return delegate_->GetStartCaptureFormat();
-  }
-  virtual sigslot::repeater2<VideoCapturer*, CaptureState>&
-      SignalVideoCaptureStateChange() {
-    return delegate_->SignalVideoCaptureStateChange();
-  }
-
- private:
-  cricket::MediaEngineInterface* delegate_;
-};
-
-}  // namespace cricket
-#else
-
-#include "talk/media/webrtc/webrtcvideoengine.h"
-#ifdef WEBRTC_CHROMIUM_BUILD
-#include "talk/media/webrtc/webrtcvideoengine2.h"
-#endif
-#include "talk/media/webrtc/webrtcvoiceengine.h"
-
-namespace cricket {
-typedef CompositeMediaEngine<WebRtcVoiceEngine, WebRtcVideoEngine>
-        WebRtcCompositeMediaEngine;
-
-class WebRtcMediaEngine : public WebRtcCompositeMediaEngine {
- public:
-  WebRtcMediaEngine(webrtc::AudioDeviceModule* adm,
-      webrtc::AudioDeviceModule* adm_sc,
       WebRtcVideoEncoderFactory* encoder_factory,
       WebRtcVideoDecoderFactory* decoder_factory);
 };