| Index: webrtc/voice_engine/transmit_mixer.h | 
| diff --git a/webrtc/voice_engine/transmit_mixer.h b/webrtc/voice_engine/transmit_mixer.h | 
| index 2e728f8e1caa4f7164e554b9c20efce4a913ac94..7c352e57c91e8073e82dd09ff65df74bfcf3be2d 100644 | 
| --- a/webrtc/voice_engine/transmit_mixer.h | 
| +++ b/webrtc/voice_engine/transmit_mixer.h | 
| @@ -32,7 +32,6 @@ | 
| #endif | 
|  | 
| namespace webrtc { | 
| - | 
| class AudioProcessing; | 
| class ProcessThread; | 
|  | 
| @@ -64,16 +63,10 @@ public: | 
| uint16_t currentMicLevel, | 
| bool keyPressed); | 
|  | 
| - | 
| -    int32_t DemuxAndMix(); | 
| -    // Used by the Chrome to pass the recording data to the specific VoE | 
| -    // channels for demux. | 
| -    void DemuxAndMix(const int voe_channels[], size_t number_of_voe_channels); | 
| - | 
| -    int32_t EncodeAndSend(); | 
| +    void ProcessAudio(); | 
| // Used by the Chrome to pass the recording data to the specific VoE | 
| -    // channels for encoding and sending to the network. | 
| -    void EncodeAndSend(const int voe_channels[], size_t number_of_voe_channels); | 
| +    // channels for processing. | 
| +    void ProcessAudio(const int voe_channels[], size_t number_of_voe_channels); | 
|  | 
| // Must be called on the same thread as PrepareDemux(). | 
| uint32_t CaptureLevel() const; | 
|  |