| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include <memory> |
| 6 |
| 5 #include "base/bind.h" | 7 #include "base/bind.h" |
| 6 #include "base/bind_helpers.h" | 8 #include "base/bind_helpers.h" |
| 7 #include "base/macros.h" | 9 #include "base/macros.h" |
| 8 #include "base/synchronization/waitable_event.h" | 10 #include "base/synchronization/waitable_event.h" |
| 9 #include "base/threading/thread.h" | 11 #include "base/threading/thread.h" |
| 10 #include "media/audio/audio_manager.h" | 12 #include "media/audio/audio_manager.h" |
| 11 #include "media/audio/simple_sources.h" | 13 #include "media/audio/simple_sources.h" |
| 12 #include "media/audio/virtual_audio_input_stream.h" | 14 #include "media/audio/virtual_audio_input_stream.h" |
| 13 #include "media/audio/virtual_audio_output_stream.h" | 15 #include "media/audio/virtual_audio_output_stream.h" |
| 14 #include "testing/gmock/include/gmock/gmock.h" | 16 #include "testing/gmock/include/gmock/gmock.h" |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 61 | 63 |
| 62 void SyncWithAudioThread() { | 64 void SyncWithAudioThread() { |
| 63 base::WaitableEvent done(false, false); | 65 base::WaitableEvent done(false, false); |
| 64 audio_task_runner()->PostTask( | 66 audio_task_runner()->PostTask( |
| 65 FROM_HERE, base::Bind(&base::WaitableEvent::Signal, | 67 FROM_HERE, base::Bind(&base::WaitableEvent::Signal, |
| 66 base::Unretained(&done))); | 68 base::Unretained(&done))); |
| 67 done.Wait(); | 69 done.Wait(); |
| 68 } | 70 } |
| 69 | 71 |
| 70 private: | 72 private: |
| 71 scoped_ptr<base::Thread> audio_thread_; | 73 std::unique_ptr<base::Thread> audio_thread_; |
| 72 scoped_refptr<base::SingleThreadTaskRunner> audio_task_runner_; | 74 scoped_refptr<base::SingleThreadTaskRunner> audio_task_runner_; |
| 73 | 75 |
| 74 DISALLOW_COPY_AND_ASSIGN(VirtualAudioOutputStreamTest); | 76 DISALLOW_COPY_AND_ASSIGN(VirtualAudioOutputStreamTest); |
| 75 }; | 77 }; |
| 76 | 78 |
| 77 TEST_F(VirtualAudioOutputStreamTest, StartStopStartStop) { | 79 TEST_F(VirtualAudioOutputStreamTest, StartStopStartStop) { |
| 78 static const int kCycles = 3; | 80 static const int kCycles = 3; |
| 79 | 81 |
| 80 MockVirtualAudioInputStream* const input_stream = | 82 MockVirtualAudioInputStream* const input_stream = |
| 81 new MockVirtualAudioInputStream(audio_task_runner()); | 83 new MockVirtualAudioInputStream(audio_task_runner()); |
| (...skipping 30 matching lines...) Expand all Loading... |
| 112 base::Unretained(output_stream))); | 114 base::Unretained(output_stream))); |
| 113 | 115 |
| 114 audio_task_runner()->PostTask( | 116 audio_task_runner()->PostTask( |
| 115 FROM_HERE, base::Bind(&MockVirtualAudioInputStream::Close, | 117 FROM_HERE, base::Bind(&MockVirtualAudioInputStream::Close, |
| 116 base::Unretained(input_stream))); | 118 base::Unretained(input_stream))); |
| 117 | 119 |
| 118 SyncWithAudioThread(); | 120 SyncWithAudioThread(); |
| 119 } | 121 } |
| 120 | 122 |
| 121 } // namespace media | 123 } // namespace media |
| OLD | NEW |