Remove VoEExternalMedia interface.

webrtc/voice_engine/output_mixer.h

Index: webrtc/voice_engine/output_mixer.h
diff --git a/webrtc/voice_engine/output_mixer.h b/webrtc/voice_engine/output_mixer.h
index 5e3e2e708e3bd706e9fc34827866099022b27b75..b005f42766638becf7facc132dddbd54097cfee1 100644
--- a/webrtc/voice_engine/output_mixer.h
+++ b/webrtc/voice_engine/output_mixer.h
@@ -26,7 +26,6 @@ namespace webrtc {
 
 class AudioProcessing;
 class FileWrapper;
-class VoEMediaProcess;
 
 namespace voe {
 
@@ -45,12 +44,6 @@ public:
     int32_t SetAudioProcessingModule(
         AudioProcessing* audioProcessingModule);
 
-    // VoEExternalMedia
-    int RegisterExternalMediaProcessing(
-        VoEMediaProcess& proccess_object);
-
-    int DeRegisterExternalMediaProcessing();
-
     int32_t MixActiveChannels();
 
     int32_t DoOperationsOnCombinedSignal(bool feed_data_to_apm);
@@ -105,7 +98,6 @@ private:
     Statistics* _engineStatisticsPtr;
     AudioProcessing* _audioProcessingModulePtr;
 
-    rtc::CriticalSection _callbackCritSect;
     // Protects output_file_recorder_ and _outputFileRecording.
     rtc::CriticalSection _fileCritSect;
     AudioConferenceMixer& _mixerModule;
@@ -116,8 +108,6 @@ private:
     PushResampler<int16_t> audioproc_resampler_;
     AudioLevel _audioLevel;    // measures audio level for the combined signal
     int _instanceId;
-    VoEMediaProcess* _externalMediaCallbackPtr;
-    bool _externalMedia;
     float _panLeft;
     float _panRight;
     int _mixingFrequencyHz;