SetIOAllowed when stopping worker audio threads

chrome/browser/chromeos/audio_mixer_pulse.cc

 // Copyright (c) 2010 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 "chrome/browser/chromeos/audio_mixer_pulse.h"
 
 #include <pulse/pulseaudio.h>
 
 #include "base/logging.h"
 #include "base/task.h"
+#include "base/threading/thread_restrictions.h"
 
 namespace chromeos {
 
 // Using asynchronous versions of the threaded PulseAudio API, as well
 // as a worker thread so gets, sets, and the init sequence do not block the
 // calling thread.  GetVolume() and IsMute() can still be called synchronously
 // if needed, but take a bit longer (~2ms vs ~0.3ms).
 //
 // Set calls just return without waiting.  If you must guarantee the value has
 // been set before continuing, immediately call the blocking Get version to
@@ skipping 31 matching lines @@
       last_channels_(0),
       mainloop_lock_count_(0),
       mixer_state_(UNINITIALIZED),
       pa_context_(NULL),
       pa_mainloop_(NULL) {
 }
 
 AudioMixerPulse::~AudioMixerPulse() {
   PulseAudioFree();
   if (thread_ != NULL) {
+    // A ScopedAllowIO object is required to join the thread when calling Stop.
+    // The worker thread should be idle at this time.
+    // See http://crosbug.com/11110 for discussion.
+    base::ThreadRestrictions::ScopedAllowIO allow_io_for_thread_join;
+
     thread_->Stop();
     thread_.reset();
   }
 }
 
 void AudioMixerPulse::Init(InitDoneCallback* callback) {
   DCHECK(callback);
   if (!InitThread()) {
     callback->Run(false);
     delete callback;
@@ skipping 384 matching lines @@
     return false;
   if (!pa_mainloop_)
     return false;
   pa_threaded_mainloop_lock(pa_mainloop_);
   ++mainloop_lock_count_;
   return true;
 }
 
 }  // namespace chromeos