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 "base/bind.h" | 5 #include "base/bind.h" |
6 #include "base/bind_helpers.h" | 6 #include "base/bind_helpers.h" |
7 #include "base/macros.h" | 7 #include "base/macros.h" |
8 #include "base/synchronization/waitable_event.h" | 8 #include "base/synchronization/waitable_event.h" |
9 #include "base/threading/thread.h" | 9 #include "base/threading/thread.h" |
10 #include "media/audio/audio_manager.h" | 10 #include "media/audio/audio_manager.h" |
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
61 | 61 |
62 void SyncWithAudioThread() { | 62 void SyncWithAudioThread() { |
63 base::WaitableEvent done(false, false); | 63 base::WaitableEvent done(false, false); |
64 audio_task_runner()->PostTask( | 64 audio_task_runner()->PostTask( |
65 FROM_HERE, base::Bind(&base::WaitableEvent::Signal, | 65 FROM_HERE, base::Bind(&base::WaitableEvent::Signal, |
66 base::Unretained(&done))); | 66 base::Unretained(&done))); |
67 done.Wait(); | 67 done.Wait(); |
68 } | 68 } |
69 | 69 |
70 private: | 70 private: |
71 scoped_ptr<base::Thread> audio_thread_; | 71 std::unique_ptr<base::Thread> audio_thread_; |
danakj
2016/04/22 22:47:37
include memory
dcheng
2016/04/22 23:13:21
Done.
| |
72 scoped_refptr<base::SingleThreadTaskRunner> audio_task_runner_; | 72 scoped_refptr<base::SingleThreadTaskRunner> audio_task_runner_; |
73 | 73 |
74 DISALLOW_COPY_AND_ASSIGN(VirtualAudioOutputStreamTest); | 74 DISALLOW_COPY_AND_ASSIGN(VirtualAudioOutputStreamTest); |
75 }; | 75 }; |
76 | 76 |
77 TEST_F(VirtualAudioOutputStreamTest, StartStopStartStop) { | 77 TEST_F(VirtualAudioOutputStreamTest, StartStopStartStop) { |
78 static const int kCycles = 3; | 78 static const int kCycles = 3; |
79 | 79 |
80 MockVirtualAudioInputStream* const input_stream = | 80 MockVirtualAudioInputStream* const input_stream = |
81 new MockVirtualAudioInputStream(audio_task_runner()); | 81 new MockVirtualAudioInputStream(audio_task_runner()); |
(...skipping 30 matching lines...) Expand all Loading... | |
112 base::Unretained(output_stream))); | 112 base::Unretained(output_stream))); |
113 | 113 |
114 audio_task_runner()->PostTask( | 114 audio_task_runner()->PostTask( |
115 FROM_HERE, base::Bind(&MockVirtualAudioInputStream::Close, | 115 FROM_HERE, base::Bind(&MockVirtualAudioInputStream::Close, |
116 base::Unretained(input_stream))); | 116 base::Unretained(input_stream))); |
117 | 117 |
118 SyncWithAudioThread(); | 118 SyncWithAudioThread(); |
119 } | 119 } |
120 | 120 |
121 } // namespace media | 121 } // namespace media |
OLD | NEW |