| Index: webrtc/modules/audio_device/mac/audio_device_mac.h
 | 
| diff --git a/webrtc/modules/audio_device/mac/audio_device_mac.h b/webrtc/modules/audio_device/mac/audio_device_mac.h
 | 
| index c8a4b200076351a03a314a0e51ae40f41a4ae643..bdd8d8352e15b6d2a2b9b3a994c086656b64a2a2 100644
 | 
| --- a/webrtc/modules/audio_device/mac/audio_device_mac.h
 | 
| +++ b/webrtc/modules/audio_device/mac/audio_device_mac.h
 | 
| @@ -123,7 +123,6 @@ class AudioDeviceMac : public AudioDeviceGeneric {
 | 
|    virtual int32_t SpeakerVolume(uint32_t& volume) const;
 | 
|    virtual int32_t MaxSpeakerVolume(uint32_t& maxVolume) const;
 | 
|    virtual int32_t MinSpeakerVolume(uint32_t& minVolume) const;
 | 
| -  virtual int32_t SpeakerVolumeStepSize(uint16_t& stepSize) const;
 | 
|  
 | 
|    // Microphone volume controls
 | 
|    virtual int32_t MicrophoneVolumeIsAvailable(bool& available);
 | 
| @@ -131,7 +130,6 @@ class AudioDeviceMac : public AudioDeviceGeneric {
 | 
|    virtual int32_t MicrophoneVolume(uint32_t& volume) const;
 | 
|    virtual int32_t MaxMicrophoneVolume(uint32_t& maxVolume) const;
 | 
|    virtual int32_t MinMicrophoneVolume(uint32_t& minVolume) const;
 | 
| -  virtual int32_t MicrophoneVolumeStepSize(uint16_t& stepSize) const;
 | 
|  
 | 
|    // Microphone mute control
 | 
|    virtual int32_t MicrophoneMuteIsAvailable(bool& available);
 | 
| @@ -143,11 +141,6 @@ class AudioDeviceMac : public AudioDeviceGeneric {
 | 
|    virtual int32_t SetSpeakerMute(bool enable);
 | 
|    virtual int32_t SpeakerMute(bool& enabled) const;
 | 
|  
 | 
| -  // Microphone boost control
 | 
| -  virtual int32_t MicrophoneBoostIsAvailable(bool& available);
 | 
| -  virtual int32_t SetMicrophoneBoost(bool enable);
 | 
| -  virtual int32_t MicrophoneBoost(bool& enabled) const;
 | 
| -
 | 
|    // Stereo support
 | 
|    virtual int32_t StereoPlayoutIsAvailable(bool& available);
 | 
|    virtual int32_t SetStereoPlayout(bool enable);
 | 
| @@ -157,16 +150,9 @@ class AudioDeviceMac : public AudioDeviceGeneric {
 | 
|    virtual int32_t StereoRecording(bool& enabled) const;
 | 
|  
 | 
|    // Delay information and control
 | 
| -  virtual int32_t SetPlayoutBuffer(const AudioDeviceModule::BufferType type,
 | 
| -                                   uint16_t sizeMS);
 | 
| -  virtual int32_t PlayoutBuffer(AudioDeviceModule::BufferType& type,
 | 
| -                                uint16_t& sizeMS) const;
 | 
|    virtual int32_t PlayoutDelay(uint16_t& delayMS) const;
 | 
|    virtual int32_t RecordingDelay(uint16_t& delayMS) const;
 | 
|  
 | 
| -  // CPU load
 | 
| -  virtual int32_t CPULoad(uint16_t& load) const;
 | 
| -
 | 
|    virtual bool PlayoutWarning() const;
 | 
|    virtual bool PlayoutError() const;
 | 
|    virtual bool RecordingWarning() const;
 | 
| @@ -312,8 +298,6 @@ class AudioDeviceMac : public AudioDeviceGeneric {
 | 
|  
 | 
|    SInt16 _renderConvertData[PLAY_BUF_SIZE_IN_SAMPLES];
 | 
|  
 | 
| -  AudioDeviceModule::BufferType _playBufType;
 | 
| -
 | 
|    bool _initialized;
 | 
|    bool _isShutDown;
 | 
|    bool _recording;
 | 
| @@ -349,8 +333,6 @@ class AudioDeviceMac : public AudioDeviceGeneric {
 | 
|  
 | 
|    int32_t _renderDelayOffsetSamples;
 | 
|  
 | 
| -  uint16_t _playBufDelayFixed;  // fixed playback delay
 | 
| -
 | 
|    uint16_t _playWarning;
 | 
|    uint16_t _playError;
 | 
|    uint16_t _recWarning;
 | 
| 
 |