stopping the audio thread before destroying the AudioManager<Platform>

content/browser/speech/speech_recognizer_impl_unittest.cc

Index: content/browser/speech/speech_recognizer_impl_unittest.cc
diff --git a/content/browser/speech/speech_recognizer_impl_unittest.cc b/content/browser/speech/speech_recognizer_impl_unittest.cc
index baf3a3ef6623de76b3b3cd342ae9ece06050f491..286ba7c22f0b551dfb48aa14f105521cd02cf469 100644
--- a/content/browser/speech/speech_recognizer_impl_unittest.cc
+++ b/content/browser/speech/speech_recognizer_impl_unittest.cc
@@ -24,7 +24,7 @@ using media::TestAudioInputControllerFactory;
 
 namespace {
 
-class MockAudioManager : public AudioManager {
+class MockAudioManager : public AudioManagerBase {
  public:
   MockAudioManager() {
     audio_thread_.reset(new base::Thread("MockAudioThread"));
@@ -39,7 +39,7 @@ class MockAudioManager : public AudioManager {
       media::AudioDeviceNames* device_names) OVERRIDE {}
   virtual AudioOutputStream* MakeAudioOutputStream(
         const AudioParameters& params) OVERRIDE {
-    return FakeAudioOutputStream::MakeFakeStream(params);
+    return FakeAudioOutputStream::MakeFakeStream(this, params);
   }
   virtual AudioOutputStream* MakeAudioOutputStreamProxy(
         const AudioParameters& params) OVERRIDE {
@@ -48,7 +48,19 @@ class MockAudioManager : public AudioManager {
   }
   virtual AudioInputStream* MakeAudioInputStream(
         const AudioParameters& params, const std::string& device_id) OVERRIDE {
-    return FakeAudioInputStream::MakeFakeStream(params);
+    return FakeAudioInputStream::MakeFakeStream(this, params);
+  }
+  virtual AudioOutputStream* MakeLinearOutputStream(
+      const AudioParameters& params) OVERRIDE { return NULL; }

[Primiano Tucci (use gerrit), 2012/03/14 11:35:15]

Can you just add NOTREACHED() (also in the other 3 methods below) before
returning NULL, so we'll be sure not to end in dereferencing a null pointer?
Thanks.

[no longer working on chromium, 2012/03/14 11:40:11]

Hi Primiano, I am sorry I pressed the button too early, please let me make
another CL to address your comment. 

Thanks,
BR,
/SX

[scherkus (not reviewing), 2012/03/20 13:35:06]

FYI NOTREACHED() only works in debug build as it expands to DCHECK(false)

+  virtual AudioOutputStream* MakeLowLatencyOutputStream(
+      const AudioParameters& params) OVERRIDE { return NULL; }
+  virtual AudioInputStream* MakeLinearInputStream(
+      const AudioParameters& params, const std::string& device_id) OVERRIDE {
+    return NULL;
+  }
+  virtual AudioInputStream* MakeLowLatencyInputStream(
+      const AudioParameters& params, const std::string& device_id) OVERRIDE {
+    return NULL;
   }
   virtual void MuteAll() OVERRIDE {}
   virtual void UnMuteAll() OVERRIDE {}