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

Side by Side Diff: media/audio/cras/cras_input_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_input.cc ('k') | media/audio/cras/cras_output.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 <unistd.h> 5 #include <unistd.h>
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/synchronization/waitable_event.h" 9 #include "base/synchronization/waitable_event.h"
10 #include "base/test/test_timeouts.h" 10 #include "base/test/test_timeouts.h"
11 #include "base/time.h" 11 #include "base/time.h"
12 #include "media/audio/cras/audio_manager_cras.h" 12 #include "media/audio/cras/audio_manager_cras.h"
13 #include "media/audio/cras/cras_input.h" 13 #include "media/audio/cras/cras_input.h"
14 #include "testing/gmock/include/gmock/gmock.h" 14 #include "testing/gmock/include/gmock/gmock.h"
15 #include "testing/gtest/include/gtest/gtest.h" 15 #include "testing/gtest/include/gtest/gtest.h"
16 16
17 using testing::_; 17 using testing::_;
18 using testing::AtLeast; 18 using testing::AtLeast;
19 using testing::Ge; 19 using testing::Ge;
20 using testing::InvokeWithoutArgs; 20 using testing::InvokeWithoutArgs;
21 using testing::StrictMock; 21 using testing::StrictMock;
22 22
23 namespace media { 23 namespace media {
24 24
25 class MockAudioInputCallback : public AudioInputStream::AudioInputCallback { 25 class MockAudioInputCallback : public AudioInputStream::AudioInputCallback {
26 public: 26 public:
27 MOCK_METHOD5(OnData, void( 27 MOCK_METHOD5(OnData, void(
28 AudioInputStream*, const uint8*, uint32, uint32, double)); 28 AudioInputStream*, const uint8*, uint32, uint32, double));
29 MOCK_METHOD2(OnError, void(AudioInputStream*, int)); 29 MOCK_METHOD1(OnError, void(AudioInputStream*));
30 MOCK_METHOD1(OnClose, void(AudioInputStream*)); 30 MOCK_METHOD1(OnClose, void(AudioInputStream*));
31 }; 31 };
32 32
33 class MockAudioManagerCrasInput : public AudioManagerCras { 33 class MockAudioManagerCrasInput : public AudioManagerCras {
34 public: 34 public:
35 // We need to override this function in order to skip checking the number 35 // We need to override this function in order to skip checking the number
36 // of active output streams. It is because the number of active streams 36 // of active output streams. It is because the number of active streams
37 // is managed inside MakeAudioInputStream, and we don't use 37 // is managed inside MakeAudioInputStream, and we don't use
38 // MakeAudioInputStream to create the stream in the tests. 38 // MakeAudioInputStream to create the stream in the tests.
39 virtual void ReleaseInputStream(AudioInputStream* stream) OVERRIDE { 39 virtual void ReleaseInputStream(AudioInputStream* stream) OVERRIDE {
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after
203 AudioParameters params_stereo(kTestFormat, 203 AudioParameters params_stereo(kTestFormat,
204 CHANNEL_LAYOUT_STEREO, 204 CHANNEL_LAYOUT_STEREO,
205 rates[i], 205 rates[i],
206 kTestBitsPerSample, 206 kTestBitsPerSample,
207 kTestFramesPerPacket); 207 kTestFramesPerPacket);
208 CaptureSomeFrames(params_stereo, kTestCaptureDurationMs); 208 CaptureSomeFrames(params_stereo, kTestCaptureDurationMs);
209 } 209 }
210 } 210 }
211 211
212 } // namespace media 212 } // namespace media
OLDNEW
« no previous file with comments | « media/audio/cras/cras_input.cc ('k') | media/audio/cras/cras_output.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698