Merge branch 'develop'

Author: kanat

modules/audio_device/audio_device_impl.h

@@ -157,18 +157,10 @@ class AudioDeviceModuleImpl : public AudioDeviceModuleForTest {
   int GetRecordAudioParameters(AudioParameters* params) const override;
 #endif  // WEBRTC_IOS
 
-
   int32_t SetAudioDeviceSink(AudioDeviceSink* sink) const override;
   int32_t GetPlayoutDevice() const override;
   int32_t GetRecordingDevice() const override;
 
-#if defined(WEBRTC_ANDROID)
-  // Only use this acccessor for test purposes on Android.
-  AudioManager* GetAndroidAudioManagerForTest() {
-    return audio_manager_android_.get();
-  }
-#endif
-
   AudioDeviceBuffer* GetAudioDeviceBuffer() { return &audio_device_buffer_; }
 
   int RestartPlayoutInternally() override { return -1; }
@@ -185,9 +177,6 @@ class AudioDeviceModuleImpl : public AudioDeviceModuleForTest {
   bool initialized_ = false;
 #if defined(WEBRTC_IOS)
   bool bypass_voice_processing_;
-#elif defined(WEBRTC_ANDROID)
-  // Should be declared first to ensure that it outlives other resources.
-  std::unique_ptr<AudioManager> audio_manager_android_;
 #endif
   AudioDeviceBuffer audio_device_buffer_;
   std::unique_ptr<AudioDeviceGeneric> audio_device_;