Improved error handling in iOS ADM to avoid race during init

webrtc/modules/audio_device/ios/audio_device_ios.h

Index: webrtc/modules/audio_device/ios/audio_device_ios.h
diff --git a/webrtc/modules/audio_device/ios/audio_device_ios.h b/webrtc/modules/audio_device/ios/audio_device_ios.h
index 8f8ba0a9c53ce7c6cd059885f3e241829bf01dea..286fd34e8a9dce3251699356301a8f6e79a161e5 100644
--- a/webrtc/modules/audio_device/ios/audio_device_ios.h
+++ b/webrtc/modules/audio_device/ios/audio_device_ios.h
@@ -184,6 +184,9 @@ class AudioDeviceIOS : public AudioDeviceGeneric {
   // Closes and deletes the voice-processing I/O unit.
   bool ShutdownPlayOrRecord();
 
+  // Helper method for destroying the existing audio unit.
+  void DisposeAudioUnit();
+
   // Callback function called on a real-time priority I/O thread from the audio
   // unit. This method is used to signal that recorded audio is available.
   static OSStatus RecordedDataIsAvailable(
@@ -211,6 +214,8 @@ class AudioDeviceIOS : public AudioDeviceGeneric {
                             UInt32 in_number_frames,
                             AudioBufferList* io_data);
 
+  static volatile int object_count_;

[tkchin_webrtc, 2015/11/16 21:30:08]

nit: Add comment for what this is used for and why it has to be static

[henrika_webrtc, 2015/11/17 14:46:11]

Done.

+
   // Ensures that methods are called from the same thread as this object is
   // created on.
   rtc::ThreadChecker thread_checker_;