| Index: webrtc/test/mock_voice_engine.h
 | 
| diff --git a/webrtc/test/mock_voice_engine.h b/webrtc/test/mock_voice_engine.h
 | 
| index 406b58f69d65ad9ceec2e268785da3dbc2747d6f..8e0720d2fae3cf6ea5926eb4e432a955503f8f48 100644
 | 
| --- a/webrtc/test/mock_voice_engine.h
 | 
| +++ b/webrtc/test/mock_voice_engine.h
 | 
| @@ -76,46 +76,6 @@ class MockVoiceEngine : public VoiceEngineImpl {
 | 
|      return std::unique_ptr<voe::ChannelProxy>(ChannelProxyFactory(channel_id));
 | 
|    }
 | 
|  
 | 
| -  // VoEAudioProcessing
 | 
| -  MOCK_METHOD2(SetNsStatus, int(bool enable, NsModes mode));
 | 
| -  MOCK_METHOD2(GetNsStatus, int(bool& enabled, NsModes& mode));
 | 
| -  MOCK_METHOD2(SetAgcStatus, int(bool enable, AgcModes mode));
 | 
| -  MOCK_METHOD2(GetAgcStatus, int(bool& enabled, AgcModes& mode));
 | 
| -  MOCK_METHOD1(SetAgcConfig, int(AgcConfig config));
 | 
| -  MOCK_METHOD1(GetAgcConfig, int(AgcConfig& config));
 | 
| -  MOCK_METHOD2(SetEcStatus, int(bool enable, EcModes mode));
 | 
| -  MOCK_METHOD2(GetEcStatus, int(bool& enabled, EcModes& mode));
 | 
| -  MOCK_METHOD1(EnableDriftCompensation, int(bool enable));
 | 
| -  MOCK_METHOD0(DriftCompensationEnabled, bool());
 | 
| -  MOCK_METHOD1(SetDelayOffsetMs, void(int offset));
 | 
| -  MOCK_METHOD0(DelayOffsetMs, int());
 | 
| -  MOCK_METHOD2(SetAecmMode, int(AecmModes mode, bool enableCNG));
 | 
| -  MOCK_METHOD2(GetAecmMode, int(AecmModes& mode, bool& enabledCNG));
 | 
| -  MOCK_METHOD1(EnableHighPassFilter, int(bool enable));
 | 
| -  MOCK_METHOD0(IsHighPassFilterEnabled, bool());
 | 
| -  MOCK_METHOD1(VoiceActivityIndicator, int(int channel));
 | 
| -  MOCK_METHOD1(SetEcMetricsStatus, int(bool enable));
 | 
| -  MOCK_METHOD1(GetEcMetricsStatus, int(bool& enabled));
 | 
| -  MOCK_METHOD4(GetEchoMetrics, int(int& ERL, int& ERLE, int& RERL, int& A_NLP));
 | 
| -  MOCK_METHOD3(GetEcDelayMetrics,
 | 
| -               int(int& delay_median,
 | 
| -                   int& delay_std,
 | 
| -                   float& fraction_poor_delays));
 | 
| -  MOCK_METHOD1(StartDebugRecording, int(const char* fileNameUTF8));
 | 
| -  MOCK_METHOD1(StartDebugRecording, int(FILE* file_handle));
 | 
| -  MOCK_METHOD0(StopDebugRecording, int());
 | 
| -  MOCK_METHOD1(SetTypingDetectionStatus, int(bool enable));
 | 
| -  MOCK_METHOD1(GetTypingDetectionStatus, int(bool& enabled));
 | 
| -  MOCK_METHOD1(TimeSinceLastTyping, int(int& seconds));
 | 
| -  MOCK_METHOD5(SetTypingDetectionParameters,
 | 
| -               int(int timeWindow,
 | 
| -                   int costPerTyping,
 | 
| -                   int reportingThreshold,
 | 
| -                   int penaltyDecay,
 | 
| -                   int typeEventDelay));
 | 
| -  MOCK_METHOD1(EnableStereoChannelSwapping, void(bool enable));
 | 
| -  MOCK_METHOD0(IsStereoChannelSwappingEnabled, bool());
 | 
| -
 | 
|    // VoEBase
 | 
|    MOCK_METHOD1(RegisterVoiceEngineObserver, int(VoiceEngineObserver& observer));
 | 
|    MOCK_METHOD0(DeRegisterVoiceEngineObserver, int());
 | 
| @@ -213,29 +173,6 @@ class MockVoiceEngine : public VoiceEngineImpl {
 | 
|                 int(OutStream* stream, CodecInst* compression));
 | 
|    MOCK_METHOD0(StopRecordingMicrophone, int());
 | 
|  
 | 
| -  // VoEHardware
 | 
| -  MOCK_METHOD1(GetNumOfRecordingDevices, int(int& devices));
 | 
| -  MOCK_METHOD1(GetNumOfPlayoutDevices, int(int& devices));
 | 
| -  MOCK_METHOD3(GetRecordingDeviceName,
 | 
| -               int(int index, char strNameUTF8[128], char strGuidUTF8[128]));
 | 
| -  MOCK_METHOD3(GetPlayoutDeviceName,
 | 
| -               int(int index, char strNameUTF8[128], char strGuidUTF8[128]));
 | 
| -  MOCK_METHOD2(SetRecordingDevice,
 | 
| -               int(int index, StereoChannel recordingChannel));
 | 
| -  MOCK_METHOD1(SetPlayoutDevice, int(int index));
 | 
| -  MOCK_METHOD1(SetAudioDeviceLayer, int(AudioLayers audioLayer));
 | 
| -  MOCK_METHOD1(GetAudioDeviceLayer, int(AudioLayers& audioLayer));
 | 
| -  MOCK_METHOD1(SetRecordingSampleRate, int(unsigned int samples_per_sec));
 | 
| -  MOCK_CONST_METHOD1(RecordingSampleRate, int(unsigned int* samples_per_sec));
 | 
| -  MOCK_METHOD1(SetPlayoutSampleRate, int(unsigned int samples_per_sec));
 | 
| -  MOCK_CONST_METHOD1(PlayoutSampleRate, int(unsigned int* samples_per_sec));
 | 
| -  MOCK_CONST_METHOD0(BuiltInAECIsAvailable, bool());
 | 
| -  MOCK_METHOD1(EnableBuiltInAEC, int(bool enable));
 | 
| -  MOCK_CONST_METHOD0(BuiltInAGCIsAvailable, bool());
 | 
| -  MOCK_METHOD1(EnableBuiltInAGC, int(bool enable));
 | 
| -  MOCK_CONST_METHOD0(BuiltInNSIsAvailable, bool());
 | 
| -  MOCK_METHOD1(EnableBuiltInNS, int(bool enable));
 | 
| -
 | 
|    // VoENetEqStats
 | 
|    MOCK_METHOD2(GetNetworkStatistics,
 | 
|                 int(int channel, NetworkStatistics& stats));
 | 
| 
 |