| Index: webrtc/modules/audio_device/linux/audio_device_pulse_linux.h
 | 
| diff --git a/webrtc/modules/audio_device/linux/audio_device_pulse_linux.h b/webrtc/modules/audio_device/linux/audio_device_pulse_linux.h
 | 
| index 00ed5477bafa689235e1d0f8a007d09aa7cd8796..7e8d68347bc5e7354e5d2b9699af527bc8721424 100644
 | 
| --- a/webrtc/modules/audio_device/linux/audio_device_pulse_linux.h
 | 
| +++ b/webrtc/modules/audio_device/linux/audio_device_pulse_linux.h
 | 
| @@ -157,7 +157,6 @@ public:
 | 
|      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;
 | 
| @@ -165,7 +164,6 @@ public:
 | 
|      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;
 | 
| @@ -177,11 +175,6 @@ public:
 | 
|      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) override;
 | 
|      int32_t SetStereoPlayout(bool enable) override;
 | 
| @@ -191,16 +184,9 @@ public:
 | 
|      int32_t StereoRecording(bool& enabled) const override;
 | 
|  
 | 
|      // Delay information and control
 | 
| -    int32_t SetPlayoutBuffer(const AudioDeviceModule::BufferType type,
 | 
| -                             uint16_t sizeMS) override;
 | 
| -    int32_t PlayoutBuffer(AudioDeviceModule::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;
 | 
| -
 | 
|      bool PlayoutWarning() const override;
 | 
|      bool PlayoutError() const override;
 | 
|      bool RecordingWarning() const override;
 | 
| @@ -295,8 +281,6 @@ private:
 | 
|      uint8_t _recChannels;
 | 
|      uint8_t _playChannels;
 | 
|  
 | 
| -    AudioDeviceModule::BufferType _playBufType;
 | 
| -
 | 
|      // Stores thread ID in constructor.
 | 
|      // We can then use ThreadChecker::CalledOnValidThread() to ensure that
 | 
|      // other methods are called from the same thread.
 | 
| @@ -315,8 +299,6 @@ private:
 | 
|      bool _AGC;
 | 
|      bool update_speaker_volume_at_startup_;
 | 
|  
 | 
| -    uint16_t _playBufDelayFixed; // fixed playback delay
 | 
| -
 | 
|      uint32_t _sndCardPlayDelay;
 | 
|      uint32_t _sndCardRecDelay;
 | 
|  
 | 
| 
 |