Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 <stdint.h> | 5 #include <stdint.h> |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 | 8 |
| 9 #include "base/macros.h" | 9 #include "base/macros.h" |
| 10 #include "base/run_loop.h" | 10 #include "base/run_loop.h" |
| (...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 91 return *(mock_manager_.get()); | 91 return *(mock_manager_.get()); |
| 92 } | 92 } |
| 93 | 93 |
| 94 static const ChannelLayout kTestChannelLayout; | 94 static const ChannelLayout kTestChannelLayout; |
| 95 static const int kTestSampleRate; | 95 static const int kTestSampleRate; |
| 96 static const int kTestBitsPerSample; | 96 static const int kTestBitsPerSample; |
| 97 static const AudioParameters::Format kTestFormat; | 97 static const AudioParameters::Format kTestFormat; |
| 98 static const uint32_t kTestFramesPerPacket; | 98 static const uint32_t kTestFramesPerPacket; |
| 99 | 99 |
| 100 base::TestMessageLoop message_loop_; | 100 base::TestMessageLoop message_loop_; |
| 101 scoped_ptr<StrictMock<MockAudioManagerCras>, AudioManagerDeleter> | 101 std::unique_ptr<StrictMock<MockAudioManagerCras>, AudioManagerDeleter> |
|
danakj
2016/04/22 22:47:36
include memory
dcheng
2016/04/22 23:13:20
'related header'? I could see this one going eithe
| |
| 102 mock_manager_; | 102 mock_manager_; |
| 103 | 103 |
| 104 private: | 104 private: |
| 105 DISALLOW_COPY_AND_ASSIGN(CrasUnifiedStreamTest); | 105 DISALLOW_COPY_AND_ASSIGN(CrasUnifiedStreamTest); |
| 106 }; | 106 }; |
| 107 | 107 |
| 108 const ChannelLayout CrasUnifiedStreamTest::kTestChannelLayout = | 108 const ChannelLayout CrasUnifiedStreamTest::kTestChannelLayout = |
| 109 CHANNEL_LAYOUT_STEREO; | 109 CHANNEL_LAYOUT_STEREO; |
| 110 const int CrasUnifiedStreamTest::kTestSampleRate = | 110 const int CrasUnifiedStreamTest::kTestSampleRate = |
| 111 AudioParameters::kAudioCDSampleRate; | 111 AudioParameters::kAudioCDSampleRate; |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 162 | 162 |
| 163 // Wait for samples to be captured. | 163 // Wait for samples to be captured. |
| 164 EXPECT_TRUE(event.TimedWait(TestTimeouts::action_timeout())); | 164 EXPECT_TRUE(event.TimedWait(TestTimeouts::action_timeout())); |
| 165 | 165 |
| 166 test_stream->Stop(); | 166 test_stream->Stop(); |
| 167 | 167 |
| 168 test_stream->Close(); | 168 test_stream->Close(); |
| 169 } | 169 } |
| 170 | 170 |
| 171 } // namespace media | 171 } // namespace media |
| OLD | NEW |