Check the current thread in AudioManagerBase::MakeAudio{Output,Input}Stream

media/audio/audio_manager_base.cc

 // Copyright (c) 2012 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 "media/audio/audio_manager_base.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/single_thread_task_runner.h"
@@ skipping 120 matching lines @@
   // Lazily start the worker thread.
   if (!audio_thread_.IsRunning())
     CHECK(audio_thread_.Start());
 
   return audio_thread_.task_runner();
 }
 
 AudioOutputStream* AudioManagerBase::MakeAudioOutputStream(
     const AudioParameters& params,
     const std::string& device_id) {
-  // TODO(miu): Fix ~50 call points across several unit test modules to call
-  // this method on the audio thread, then uncomment the following:
-  // DCHECK(task_runner_->BelongsToCurrentThread());
+  DCHECK(task_runner_->BelongsToCurrentThread());
 
   if (!params.IsValid()) {
     DLOG(ERROR) << "Audio parameters are invalid";
     return NULL;
   }
 
   // Limit the number of audio streams opened. This is to prevent using
   // excessive resources for a large number of audio streams. More
   // importantly it prevents instability on certain systems.
   // See bug: http://crbug.com/30242.
@@ skipping 26 matching lines @@
   if (stream) {
     ++num_output_streams_;
   }
 
   return stream;
 }
 
 AudioInputStream* AudioManagerBase::MakeAudioInputStream(
     const AudioParameters& params,
     const std::string& device_id) {
-  // TODO(miu): Fix ~20 call points across several unit test modules to call
-  // this method on the audio thread, then uncomment the following:
-  // DCHECK(task_runner_->BelongsToCurrentThread());
+  DCHECK(task_runner_->BelongsToCurrentThread());
 
   if (!params.IsValid() || (params.channels() > kMaxInputChannels) ||
       device_id.empty()) {
     DLOG(ERROR) << "Audio parameters are invalid for device " << device_id;
     return NULL;
   }
 
   if (num_input_streams_ >= max_num_input_streams_) {
     DLOG(ERROR) << "Number of opened input audio streams "
                 << num_input_streams_
@@ skipping 205 matching lines @@
 scoped_ptr<AudioLog> AudioManagerBase::CreateAudioLog(
     AudioLogFactory::AudioComponent component) {
   return audio_log_factory_->CreateAudioLog(component);
 }
 
 void AudioManagerBase::SetHasKeyboardMic() {
   NOTREACHED();
 }
 
 }  // namespace media