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

Side by Side Diff: media/audio/linux/alsa_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/linux/alsa_output.cc ('k') | media/audio/mac/audio_input_mac.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 "base/message_loop.h" 5 #include "base/message_loop.h"
6 #include "base/stringprintf.h" 6 #include "base/stringprintf.h"
7 #include "media/audio/linux/alsa_output.h" 7 #include "media/audio/linux/alsa_output.h"
8 #include "media/audio/linux/alsa_wrapper.h" 8 #include "media/audio/linux/alsa_wrapper.h"
9 #include "media/audio/linux/audio_manager_linux.h" 9 #include "media/audio/linux/audio_manager_linux.h"
10 #include "media/base/data_buffer.h" 10 #include "media/base/data_buffer.h"
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 MOCK_METHOD1(StrError, const char*(int errnum)); 66 MOCK_METHOD1(StrError, const char*(int errnum));
67 }; 67 };
68 68
69 class MockAudioSourceCallback : public AudioOutputStream::AudioSourceCallback { 69 class MockAudioSourceCallback : public AudioOutputStream::AudioSourceCallback {
70 public: 70 public:
71 MOCK_METHOD2(OnMoreData, int(AudioBus* audio_bus, 71 MOCK_METHOD2(OnMoreData, int(AudioBus* audio_bus,
72 AudioBuffersState buffers_state)); 72 AudioBuffersState buffers_state));
73 MOCK_METHOD3(OnMoreIOData, int(AudioBus* source, 73 MOCK_METHOD3(OnMoreIOData, int(AudioBus* source,
74 AudioBus* dest, 74 AudioBus* dest,
75 AudioBuffersState buffers_state)); 75 AudioBuffersState buffers_state));
76 MOCK_METHOD2(OnError, void(AudioOutputStream* stream, int code)); 76 MOCK_METHOD1(OnError, void(AudioOutputStream* stream));
77 }; 77 };
78 78
79 class MockAudioManagerLinux : public AudioManagerLinux { 79 class MockAudioManagerLinux : public AudioManagerLinux {
80 public: 80 public:
81 MOCK_METHOD0(Init, void()); 81 MOCK_METHOD0(Init, void());
82 MOCK_METHOD0(HasAudioOutputDevices, bool()); 82 MOCK_METHOD0(HasAudioOutputDevices, bool());
83 MOCK_METHOD0(HasAudioInputDevices, bool()); 83 MOCK_METHOD0(HasAudioInputDevices, bool());
84 MOCK_METHOD1(MakeLinearOutputStream, AudioOutputStream*( 84 MOCK_METHOD1(MakeLinearOutputStream, AudioOutputStream*(
85 const AudioParameters& params)); 85 const AudioParameters& params));
86 MOCK_METHOD1(MakeLowLatencyOutputStream, AudioOutputStream*( 86 MOCK_METHOD1(MakeLowLatencyOutputStream, AudioOutputStream*(
(...skipping 772 matching lines...) Expand 10 before | Expand all | Expand 10 after
859 859
860 // TODO(ajwong): Find a way to test whether or not another task has been 860 // TODO(ajwong): Find a way to test whether or not another task has been
861 // posted so we can verify that the Alsa code will indeed break the task 861 // posted so we can verify that the Alsa code will indeed break the task
862 // posting loop. 862 // posting loop.
863 863
864 test_stream->TransitionTo(AlsaPcmOutputStream::kIsClosed); 864 test_stream->TransitionTo(AlsaPcmOutputStream::kIsClosed);
865 test_stream->Close(); 865 test_stream->Close();
866 } 866 }
867 867
868 } // namespace media 868 } // namespace media
OLDNEW
« no previous file with comments | « media/audio/linux/alsa_output.cc ('k') | media/audio/mac/audio_input_mac.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698