Fix the race when the WebRtcAudioDeviceImpl goes away before capturers stop

content/renderer/media/webrtc_audio_device_impl.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/media/webrtc_audio_device_impl.h"
 
 #include "base/bind.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/string_util.h"
 #include "base/win/windows_version.h"
@@ skipping 230 matching lines @@
     return 0;
 
   StopRecording();
   StopPlayout();
 
   DCHECK(!renderer_.get() || !renderer_->IsStarted())
       << "The shared audio renderer shouldn't be running";
 
   DisableAecDump();
 
-  capturers_.clear();
+  // Stop all the capturers to ensure no further OnData() and
+  // RemoveAudioCapturer() callback.
+  // Cache the captures in a local list since WebRtcAudioCapturer::Stop()

[henrika (OOO until Aug 14), 2014/06/03 11:00:15]

capturers

[no longer working on chromium, 2014/06/03 11:31:14]

Done.

+  // will trigger RemoveAudioCapturer() callback.
+  CapturerList capturers;
+  capturers.swap(capturers_);
+  for (CapturerList::const_iterator iter = capturers.begin();
+       iter != capturers.end(); ++iter) {
+    (*iter)->Stop();
+  }
 
   initialized_ = false;
   return 0;
 }
 
 bool WebRtcAudioDeviceImpl::Initialized() const {
   return initialized_;
 }
 
 int32_t WebRtcAudioDeviceImpl::PlayoutIsAvailable(bool* available) {
@@ skipping 290 matching lines @@
 
   // Start the Aec dump on the current default capturer.
   scoped_refptr<WebRtcAudioCapturer> default_capturer(GetDefaultCapturer());
   if (!default_capturer)
     return;
 
   default_capturer->StartAecDump(aec_dump_file_.Pass());
 }
 
 }  // namespace content