| Index: content/browser/media/capture/web_contents_audio_input_stream_unittest.cc
|
| diff --git a/content/browser/media/capture/web_contents_audio_input_stream_unittest.cc b/content/browser/media/capture/web_contents_audio_input_stream_unittest.cc
|
| index c1078085dfc4bd64fe66e369b13f2f4af493b175..dd533db31c6bdf6e2f6e3cd2c4a3ac8a89f45c4c 100644
|
| --- a/content/browser/media/capture/web_contents_audio_input_stream_unittest.cc
|
| +++ b/content/browser/media/capture/web_contents_audio_input_stream_unittest.cc
|
| @@ -87,11 +87,8 @@ class MockVirtualAudioInputStream : public VirtualAudioInputStream {
|
| public:
|
| explicit MockVirtualAudioInputStream(
|
| const scoped_refptr<base::MessageLoopProxy>& worker_loop)
|
| - : VirtualAudioInputStream(TestAudioParameters(), worker_loop,
|
| - VirtualAudioInputStream::AfterCloseCallback()),
|
| - real_(TestAudioParameters(), worker_loop,
|
| - base::Bind(&MockVirtualAudioInputStream::OnRealStreamHasClosed,
|
| - base::Unretained(this))),
|
| + : VirtualAudioInputStream(TestAudioParameters(), worker_loop, false),
|
| + real_(TestAudioParameters(), worker_loop, false),
|
| real_stream_is_closed_(false) {
|
| // Set default actions of mocked methods to delegate to the concrete
|
| // implementation.
|
| @@ -102,7 +99,7 @@ class MockVirtualAudioInputStream : public VirtualAudioInputStream {
|
| ON_CALL(*this, Stop())
|
| .WillByDefault(Invoke(&real_, &VirtualAudioInputStream::Stop));
|
| ON_CALL(*this, Close())
|
| - .WillByDefault(Invoke(&real_, &VirtualAudioInputStream::Close));
|
| + .WillByDefault(Invoke(this, &MockVirtualAudioInputStream::OnClose));
|
| ON_CALL(*this, GetMaxVolume())
|
| .WillByDefault(Invoke(&real_, &VirtualAudioInputStream::GetMaxVolume));
|
| ON_CALL(*this, SetVolume(_))
|
| @@ -142,8 +139,8 @@ class MockVirtualAudioInputStream : public VirtualAudioInputStream {
|
| const AudioParameters&));
|
|
|
| private:
|
| - void OnRealStreamHasClosed(VirtualAudioInputStream* stream) {
|
| - DCHECK_EQ(&real_, stream);
|
| + void OnClose() {
|
| + real_.Close();
|
| DCHECK(!real_stream_is_closed_);
|
| real_stream_is_closed_ = true;
|
| }
|
|
|