| Index: webrtc/modules/audio_device/audio_device_impl.h
 | 
| diff --git a/webrtc/modules/audio_device/audio_device_impl.h b/webrtc/modules/audio_device/audio_device_impl.h
 | 
| index 9fdc93bd0cf5076614d1a5ede6b5aa2a8ec17d8f..69e32d4a3a3e47707a61a8c9edb15e4fc0e0253f 100644
 | 
| --- a/webrtc/modules/audio_device/audio_device_impl.h
 | 
| +++ b/webrtc/modules/audio_device/audio_device_impl.h
 | 
| @@ -110,7 +110,6 @@ class AudioDeviceModuleImpl : public AudioDeviceModule {
 | 
|    int32_t SpeakerVolume(uint32_t* volume) const override;
 | 
|    int32_t MaxSpeakerVolume(uint32_t* maxVolume) const override;
 | 
|    int32_t MinSpeakerVolume(uint32_t* minVolume) const override;
 | 
| -  int32_t SpeakerVolumeStepSize(uint16_t* stepSize) const override;
 | 
|  
 | 
|    // Microphone volume controls
 | 
|    int32_t MicrophoneVolumeIsAvailable(bool* available) override;
 | 
| @@ -118,7 +117,6 @@ class AudioDeviceModuleImpl : public AudioDeviceModule {
 | 
|    int32_t MicrophoneVolume(uint32_t* volume) const override;
 | 
|    int32_t MaxMicrophoneVolume(uint32_t* maxVolume) const override;
 | 
|    int32_t MinMicrophoneVolume(uint32_t* minVolume) const override;
 | 
| -  int32_t MicrophoneVolumeStepSize(uint16_t* stepSize) const override;
 | 
|  
 | 
|    // Speaker mute control
 | 
|    int32_t SpeakerMuteIsAvailable(bool* available) override;
 | 
| @@ -130,11 +128,6 @@ class AudioDeviceModuleImpl : public AudioDeviceModule {
 | 
|    int32_t SetMicrophoneMute(bool enable) override;
 | 
|    int32_t MicrophoneMute(bool* enabled) const override;
 | 
|  
 | 
| -  // Microphone boost control
 | 
| -  int32_t MicrophoneBoostIsAvailable(bool* available) override;
 | 
| -  int32_t SetMicrophoneBoost(bool enable) override;
 | 
| -  int32_t MicrophoneBoost(bool* enabled) const override;
 | 
| -
 | 
|    // Stereo support
 | 
|    int32_t StereoPlayoutIsAvailable(bool* available) const override;
 | 
|    int32_t SetStereoPlayout(bool enable) override;
 | 
| @@ -146,22 +139,9 @@ class AudioDeviceModuleImpl : public AudioDeviceModule {
 | 
|    int32_t RecordingChannel(ChannelType* channel) const override;
 | 
|  
 | 
|    // Delay information and control
 | 
| -  int32_t SetPlayoutBuffer(const BufferType type, uint16_t sizeMS = 0) override;
 | 
| -  int32_t PlayoutBuffer(BufferType* type, uint16_t* sizeMS) const override;
 | 
|    int32_t PlayoutDelay(uint16_t* delayMS) const override;
 | 
|    int32_t RecordingDelay(uint16_t* delayMS) const override;
 | 
|  
 | 
| -  // CPU load
 | 
| -  int32_t CPULoad(uint16_t* load) const override;
 | 
| -
 | 
| -  // Recording of raw PCM data
 | 
| -  int32_t StartRawOutputFileRecording(
 | 
| -      const char pcmFileNameUTF8[kAdmMaxFileNameSize]) override;
 | 
| -  int32_t StopRawOutputFileRecording() override;
 | 
| -  int32_t StartRawInputFileRecording(
 | 
| -      const char pcmFileNameUTF8[kAdmMaxFileNameSize]) override;
 | 
| -  int32_t StopRawInputFileRecording() override;
 | 
| -
 | 
|    // Native sample rate controls (samples/sec)
 | 
|    int32_t SetRecordingSampleRate(const uint32_t samplesPerSec) override;
 | 
|    int32_t RecordingSampleRate(uint32_t* samplesPerSec) const override;
 | 
| @@ -169,7 +149,6 @@ class AudioDeviceModuleImpl : public AudioDeviceModule {
 | 
|    int32_t PlayoutSampleRate(uint32_t* samplesPerSec) const override;
 | 
|  
 | 
|    // Mobile device specific functions
 | 
| -  int32_t ResetAudioDevice() override;
 | 
|    int32_t SetLoudspeakerStatus(bool enable) override;
 | 
|    int32_t GetLoudspeakerStatus(bool* enabled) const override;
 | 
|  
 | 
| 
 |