| Index: webrtc/voice_engine/channel.h
 | 
| diff --git a/webrtc/voice_engine/channel.h b/webrtc/voice_engine/channel.h
 | 
| index e4e819c76f8c7f24f0a7a01904895d1827ddd381..0426adfea293b2141ea899ae67652d8046e1395f 100644
 | 
| --- a/webrtc/voice_engine/channel.h
 | 
| +++ b/webrtc/voice_engine/channel.h
 | 
| @@ -71,7 +71,6 @@ class RtcpRttStatsProxy;
 | 
|  class RtpPacketSenderProxy;
 | 
|  class Statistics;
 | 
|  class TransportFeedbackProxy;
 | 
| -class TransmitMixer;
 | 
|  class TransportSequenceNumberProxy;
 | 
|  class VoERtcpObserver;
 | 
|  
 | 
| @@ -155,7 +154,6 @@ class Channel
 | 
|    int32_t Init();
 | 
|    int32_t SetEngineInformation(Statistics& engineStatistics,
 | 
|                                 OutputMixer& outputMixer,
 | 
| -                               TransmitMixer& transmitMixer,
 | 
|                                 ProcessThread& moduleProcessThread,
 | 
|                                 AudioDeviceModule& audioDeviceModule,
 | 
|                                 VoiceEngineObserver* voiceEngineObserver,
 | 
| @@ -478,7 +476,6 @@ class Channel
 | 
|    // uses
 | 
|    Statistics* _engineStatisticsPtr;
 | 
|    OutputMixer* _outputMixerPtr;
 | 
| -  TransmitMixer* _transmitMixerPtr;
 | 
|    ProcessThread* _moduleProcessThreadPtr;
 | 
|    AudioDeviceModule* _audioDeviceModulePtr;
 | 
|    VoiceEngineObserver* _voiceEngineObserverPtr;  // owned by base
 | 
| 
 |