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

Side by Side Diff: chromeos/audio/cras_audio_handler_unittest.cc

Issue 628883002: replace OVERRIDE and FINAL with override and final in chromeos/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 | « chromeos/audio/cras_audio_handler.h ('k') | chromeos/cert_loader.h » ('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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 "chromeos/audio/cras_audio_handler.h" 5 #include "chromeos/audio/cras_audio_handler.h"
6 6
7 #include "base/memory/ref_counted.h" 7 #include "base/memory/ref_counted.h"
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/message_loop/message_loop.h" 9 #include "base/message_loop/message_loop.h"
10 #include "base/values.h" 10 #include "base/values.h"
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after
186 } 186 }
187 187
188 int input_gain_changed_count() const { 188 int input_gain_changed_count() const {
189 return input_gain_changed_count_; 189 return input_gain_changed_count_;
190 } 190 }
191 191
192 virtual ~TestObserver() {} 192 virtual ~TestObserver() {}
193 193
194 protected: 194 protected:
195 // chromeos::CrasAudioHandler::AudioObserver overrides. 195 // chromeos::CrasAudioHandler::AudioObserver overrides.
196 virtual void OnActiveOutputNodeChanged() OVERRIDE { 196 virtual void OnActiveOutputNodeChanged() override {
197 ++active_output_node_changed_count_; 197 ++active_output_node_changed_count_;
198 } 198 }
199 199
200 virtual void OnActiveInputNodeChanged() OVERRIDE { 200 virtual void OnActiveInputNodeChanged() override {
201 ++active_input_node_changed_count_; 201 ++active_input_node_changed_count_;
202 } 202 }
203 203
204 virtual void OnAudioNodesChanged() OVERRIDE { 204 virtual void OnAudioNodesChanged() override {
205 ++audio_nodes_changed_count_; 205 ++audio_nodes_changed_count_;
206 } 206 }
207 207
208 virtual void OnOutputMuteChanged() OVERRIDE { 208 virtual void OnOutputMuteChanged() override {
209 ++output_mute_changed_count_; 209 ++output_mute_changed_count_;
210 } 210 }
211 211
212 virtual void OnInputMuteChanged() OVERRIDE { 212 virtual void OnInputMuteChanged() override {
213 ++input_mute_changed_count_; 213 ++input_mute_changed_count_;
214 } 214 }
215 215
216 virtual void OnOutputVolumeChanged() OVERRIDE { 216 virtual void OnOutputVolumeChanged() override {
217 ++output_volume_changed_count_; 217 ++output_volume_changed_count_;
218 } 218 }
219 219
220 virtual void OnInputGainChanged() OVERRIDE { 220 virtual void OnInputGainChanged() override {
221 ++input_gain_changed_count_; 221 ++input_gain_changed_count_;
222 } 222 }
223 223
224 private: 224 private:
225 int active_output_node_changed_count_; 225 int active_output_node_changed_count_;
226 int active_input_node_changed_count_; 226 int active_input_node_changed_count_;
227 int audio_nodes_changed_count_; 227 int audio_nodes_changed_count_;
228 int output_mute_changed_count_; 228 int output_mute_changed_count_;
229 int input_mute_changed_count_; 229 int input_mute_changed_count_;
230 int output_volume_changed_count_; 230 int output_volume_changed_count_;
231 int input_gain_changed_count_; 231 int input_gain_changed_count_;
232 232
233 DISALLOW_COPY_AND_ASSIGN(TestObserver); 233 DISALLOW_COPY_AND_ASSIGN(TestObserver);
234 }; 234 };
235 235
236 class CrasAudioHandlerTest : public testing::Test { 236 class CrasAudioHandlerTest : public testing::Test {
237 public: 237 public:
238 CrasAudioHandlerTest() : cras_audio_handler_(NULL), 238 CrasAudioHandlerTest() : cras_audio_handler_(NULL),
239 cras_audio_client_stub_(NULL) { 239 cras_audio_client_stub_(NULL) {
240 } 240 }
241 virtual ~CrasAudioHandlerTest() {} 241 virtual ~CrasAudioHandlerTest() {}
242 242
243 virtual void SetUp() OVERRIDE { 243 virtual void SetUp() override {
244 } 244 }
245 245
246 virtual void TearDown() OVERRIDE { 246 virtual void TearDown() override {
247 cras_audio_handler_->RemoveAudioObserver(test_observer_.get()); 247 cras_audio_handler_->RemoveAudioObserver(test_observer_.get());
248 test_observer_.reset(); 248 test_observer_.reset();
249 CrasAudioHandler::Shutdown(); 249 CrasAudioHandler::Shutdown();
250 audio_pref_handler_ = NULL; 250 audio_pref_handler_ = NULL;
251 DBusThreadManager::Shutdown(); 251 DBusThreadManager::Shutdown();
252 } 252 }
253 253
254 void SetUpCrasAudioHandler(const AudioNodeList& audio_nodes) { 254 void SetUpCrasAudioHandler(const AudioNodeList& audio_nodes) {
255 DBusThreadManager::Initialize(); 255 DBusThreadManager::Initialize();
256 cras_audio_client_stub_ = static_cast<CrasAudioClientStubImpl*>( 256 cras_audio_client_stub_ = static_cast<CrasAudioClientStubImpl*>(
(...skipping 1674 matching lines...) Expand 10 before | Expand all | Expand 10 after
1931 // nodes. 1931 // nodes.
1932 cras_audio_handler_->AddActiveNode(kInternalSpeaker.id); 1932 cras_audio_handler_->AddActiveNode(kInternalSpeaker.id);
1933 EXPECT_FALSE( 1933 EXPECT_FALSE(
1934 cras_audio_handler_->IsOutputMutedForDevice(kInternalSpeaker.id)); 1934 cras_audio_handler_->IsOutputMutedForDevice(kInternalSpeaker.id));
1935 EXPECT_EQ(25, 1935 EXPECT_EQ(25,
1936 cras_audio_handler_->GetOutputVolumePercentForDevice( 1936 cras_audio_handler_->GetOutputVolumePercentForDevice(
1937 kInternalSpeaker.id)); 1937 kInternalSpeaker.id));
1938 } 1938 }
1939 1939
1940 } // namespace chromeos 1940 } // namespace chromeos
OLDNEW
« no previous file with comments | « chromeos/audio/cras_audio_handler.h ('k') | chromeos/cert_loader.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698