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

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

Issue 856563004: Update {virtual,override,final} to follow C++11 style in chromeos. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 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 223 matching lines...) Expand 10 before | Expand all | Expand 10 after
234 } 234 }
235 235
236 int output_volume_changed_count() const { 236 int output_volume_changed_count() const {
237 return output_volume_changed_count_; 237 return output_volume_changed_count_;
238 } 238 }
239 239
240 int input_gain_changed_count() const { 240 int input_gain_changed_count() const {
241 return input_gain_changed_count_; 241 return input_gain_changed_count_;
242 } 242 }
243 243
244 virtual ~TestObserver() {} 244 ~TestObserver() override {}
245 245
246 protected: 246 protected:
247 // chromeos::CrasAudioHandler::AudioObserver overrides. 247 // chromeos::CrasAudioHandler::AudioObserver overrides.
248 virtual void OnActiveOutputNodeChanged() override { 248 void OnActiveOutputNodeChanged() override {
249 ++active_output_node_changed_count_; 249 ++active_output_node_changed_count_;
250 } 250 }
251 251
252 virtual void OnActiveInputNodeChanged() override { 252 void OnActiveInputNodeChanged() override {
253 ++active_input_node_changed_count_; 253 ++active_input_node_changed_count_;
254 } 254 }
255 255
256 virtual void OnAudioNodesChanged() override { 256 void OnAudioNodesChanged() override { ++audio_nodes_changed_count_; }
257 ++audio_nodes_changed_count_;
258 }
259 257
260 virtual void OnOutputMuteChanged() override { 258 void OnOutputMuteChanged() override { ++output_mute_changed_count_; }
261 ++output_mute_changed_count_;
262 }
263 259
264 virtual void OnInputMuteChanged() override { 260 void OnInputMuteChanged() override { ++input_mute_changed_count_; }
265 ++input_mute_changed_count_;
266 }
267 261
268 virtual void OnOutputVolumeChanged() override { 262 void OnOutputVolumeChanged() override { ++output_volume_changed_count_; }
269 ++output_volume_changed_count_;
270 }
271 263
272 virtual void OnInputGainChanged() override { 264 void OnInputGainChanged() override { ++input_gain_changed_count_; }
273 ++input_gain_changed_count_;
274 }
275 265
276 private: 266 private:
277 int active_output_node_changed_count_; 267 int active_output_node_changed_count_;
278 int active_input_node_changed_count_; 268 int active_input_node_changed_count_;
279 int audio_nodes_changed_count_; 269 int audio_nodes_changed_count_;
280 int output_mute_changed_count_; 270 int output_mute_changed_count_;
281 int input_mute_changed_count_; 271 int input_mute_changed_count_;
282 int output_volume_changed_count_; 272 int output_volume_changed_count_;
283 int input_gain_changed_count_; 273 int input_gain_changed_count_;
284 274
285 DISALLOW_COPY_AND_ASSIGN(TestObserver); 275 DISALLOW_COPY_AND_ASSIGN(TestObserver);
286 }; 276 };
287 277
288 class CrasAudioHandlerTest : public testing::Test { 278 class CrasAudioHandlerTest : public testing::Test {
289 public: 279 public:
290 CrasAudioHandlerTest() : cras_audio_handler_(NULL), 280 CrasAudioHandlerTest() : cras_audio_handler_(NULL),
291 fake_cras_audio_client_(NULL) { 281 fake_cras_audio_client_(NULL) {
292 } 282 }
293 virtual ~CrasAudioHandlerTest() {} 283 ~CrasAudioHandlerTest() override {}
294 284
295 virtual void SetUp() override { 285 void SetUp() override {}
296 }
297 286
298 virtual void TearDown() override { 287 void TearDown() override {
299 cras_audio_handler_->RemoveAudioObserver(test_observer_.get()); 288 cras_audio_handler_->RemoveAudioObserver(test_observer_.get());
300 test_observer_.reset(); 289 test_observer_.reset();
301 CrasAudioHandler::Shutdown(); 290 CrasAudioHandler::Shutdown();
302 audio_pref_handler_ = NULL; 291 audio_pref_handler_ = NULL;
303 DBusThreadManager::Shutdown(); 292 DBusThreadManager::Shutdown();
304 } 293 }
305 294
306 void SetUpCrasAudioHandler(const AudioNodeList& audio_nodes) { 295 void SetUpCrasAudioHandler(const AudioNodeList& audio_nodes) {
307 DBusThreadManager::Initialize(); 296 DBusThreadManager::Initialize();
308 fake_cras_audio_client_ = static_cast<FakeCrasAudioClient*>( 297 fake_cras_audio_client_ = static_cast<FakeCrasAudioClient*>(
(...skipping 1993 matching lines...) Expand 10 before | Expand all | Expand 10 after
2302 EXPECT_EQ(1, test_observer_->active_input_node_changed_count()); 2291 EXPECT_EQ(1, test_observer_->active_input_node_changed_count());
2303 test_observer_->reset_active_input_node_changed_count(); 2292 test_observer_->reset_active_input_node_changed_count();
2304 2293
2305 audio_nodes.pop_back(); 2294 audio_nodes.pop_back();
2306 ChangeAudioNodes(audio_nodes); 2295 ChangeAudioNodes(audio_nodes);
2307 EXPECT_EQ(0ULL, cras_audio_handler_->GetPrimaryActiveInputNode()); 2296 EXPECT_EQ(0ULL, cras_audio_handler_->GetPrimaryActiveInputNode());
2308 EXPECT_EQ(1, test_observer_->active_input_node_changed_count()); 2297 EXPECT_EQ(1, test_observer_->active_input_node_changed_count());
2309 } 2298 }
2310 2299
2311 } // namespace chromeos 2300 } // 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