stopping the audio thread before destroying the AudioManager<Platform>

content/browser/speech/speech_recognizer_impl_unittest.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 <vector>
 
 #include "content/browser/browser_thread_impl.h"
 #include "content/browser/speech/speech_recognizer_impl.h"
 #include "content/public/browser/speech_recognizer_delegate.h"
 #include "content/test/test_url_fetcher_factory.h"
 #include "media/audio/audio_manager.h"
 #include "media/audio/fake_audio_input_stream.h"
 #include "media/audio/fake_audio_output_stream.h"
 #include "media/audio/test_audio_input_controller_factory.h"
 #include "net/base/net_errors.h"
 #include "net/url_request/url_request_status.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using content::BrowserThread;
 using content::BrowserThreadImpl;
 using media::AudioInputController;
 using media::TestAudioInputController;
 using media::TestAudioInputControllerFactory;
 
 namespace {
 
-class MockAudioManager : public AudioManager {
+class MockAudioManager : public AudioManagerBase {
  public:
   MockAudioManager() {
     audio_thread_.reset(new base::Thread("MockAudioThread"));
     CHECK(audio_thread_->Start());
   }
   virtual bool HasAudioOutputDevices() OVERRIDE { return true; }
   virtual bool HasAudioInputDevices() OVERRIDE { return true; }
   virtual string16 GetAudioInputDeviceModel() OVERRIDE { return string16(); }
   virtual bool CanShowAudioInputSettings() OVERRIDE { return false; }
   virtual void ShowAudioInputSettings() OVERRIDE {}
   virtual void GetAudioInputDeviceNames(
       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 {
     NOTREACHED();
     return NULL;
   }
   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 {}
   virtual bool IsRecordingInProcess() OVERRIDE { return false; }
   virtual scoped_refptr<base::MessageLoopProxy> GetMessageLoop() OVERRIDE {
     return audio_thread_->message_loop_proxy();
   }
   virtual void Init() OVERRIDE {};
  private:
   scoped_ptr<base::Thread> audio_thread_;
@@ skipping 397 matching lines @@
   EXPECT_FLOAT_EQ(0.89926866f, volume_);
   EXPECT_FLOAT_EQ(0.75071919f, noise_volume_);
 
   EXPECT_EQ(content::SPEECH_RECOGNITION_ERROR_NONE, error_);
   EXPECT_FALSE(recording_complete_);
   EXPECT_FALSE(recognition_complete_);
   recognizer_->CancelRecognition();
 }
 
 }  // namespace speech