Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(139)

Side by Side Diff: media/audio/cras/cras_output_unittest.cc

Issue 12611030: Remove unused parameter to OnError() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix nits + rebase Created 7 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « media/audio/cras/cras_output.cc ('k') | media/audio/linux/alsa_input.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 <string> 5 #include <string>
6 6
7 #include "base/threading/thread.h" 7 #include "base/threading/thread.h"
8 #include "media/audio/cras/audio_manager_cras.h" 8 #include "media/audio/cras/audio_manager_cras.h"
9 #include "media/audio/cras/cras_output.h" 9 #include "media/audio/cras/cras_output.h"
10 #include "testing/gmock/include/gmock/gmock.h" 10 #include "testing/gmock/include/gmock/gmock.h"
11 #include "testing/gtest/include/gtest/gtest.h" 11 #include "testing/gtest/include/gtest/gtest.h"
12 12
13 using testing::_; 13 using testing::_;
14 using testing::DoAll; 14 using testing::DoAll;
15 using testing::Return; 15 using testing::Return;
16 using testing::SetArgumentPointee; 16 using testing::SetArgumentPointee;
17 using testing::StrictMock; 17 using testing::StrictMock;
18 18
19 namespace media { 19 namespace media {
20 20
21 class MockAudioSourceCallback : public AudioOutputStream::AudioSourceCallback { 21 class MockAudioSourceCallback : public AudioOutputStream::AudioSourceCallback {
22 public: 22 public:
23 MOCK_METHOD2(OnMoreData, int(AudioBus* audio_bus, 23 MOCK_METHOD2(OnMoreData, int(AudioBus* audio_bus,
24 AudioBuffersState buffers_state)); 24 AudioBuffersState buffers_state));
25 MOCK_METHOD3(OnMoreIOData, int(AudioBus* source, 25 MOCK_METHOD3(OnMoreIOData, int(AudioBus* source,
26 AudioBus* dest, 26 AudioBus* dest,
27 AudioBuffersState buffers_state)); 27 AudioBuffersState buffers_state));
28 MOCK_METHOD2(OnError, void(AudioOutputStream* stream, int code)); 28 MOCK_METHOD1(OnError, void(AudioOutputStream* stream));
29 }; 29 };
30 30
31 class MockAudioManagerCras : public AudioManagerCras { 31 class MockAudioManagerCras : public AudioManagerCras {
32 public: 32 public:
33 MOCK_METHOD0(Init, void()); 33 MOCK_METHOD0(Init, void());
34 MOCK_METHOD0(HasAudioOutputDevices, bool()); 34 MOCK_METHOD0(HasAudioOutputDevices, bool());
35 MOCK_METHOD0(HasAudioInputDevices, bool()); 35 MOCK_METHOD0(HasAudioInputDevices, bool());
36 MOCK_METHOD1(MakeLinearOutputStream, AudioOutputStream*( 36 MOCK_METHOD1(MakeLinearOutputStream, AudioOutputStream*(
37 const AudioParameters& params)); 37 const AudioParameters& params));
38 MOCK_METHOD1(MakeLowLatencyOutputStream, AudioOutputStream*( 38 MOCK_METHOD1(MakeLowLatencyOutputStream, AudioOutputStream*(
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after
212 212
213 // Stop. 213 // Stop.
214 test_stream->Stop(); 214 test_stream->Stop();
215 EXPECT_EQ(CrasOutputStream::kIsStopped, test_stream->state()); 215 EXPECT_EQ(CrasOutputStream::kIsStopped, test_stream->state());
216 216
217 // Close the stream. 217 // Close the stream.
218 test_stream->Close(); 218 test_stream->Close();
219 } 219 }
220 220
221 } // namespace media 221 } // namespace media
OLDNEW
« no previous file with comments | « media/audio/cras/cras_output.cc ('k') | media/audio/linux/alsa_input.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698