| OLD | NEW |
| 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 <algorithm> | 5 #include <algorithm> |
| 6 #include <string> | 6 #include <string> |
| 7 #include <vector> | 7 #include <vector> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/bind_helpers.h" | 10 #include "base/bind_helpers.h" |
| (...skipping 506 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 517 } | 517 } |
| 518 | 518 |
| 519 int output_mute_changed_count() const { | 519 int output_mute_changed_count() const { |
| 520 return output_mute_changed_count_; | 520 return output_mute_changed_count_; |
| 521 } | 521 } |
| 522 | 522 |
| 523 ~TestAudioObserver() override {} | 523 ~TestAudioObserver() override {} |
| 524 | 524 |
| 525 protected: | 525 protected: |
| 526 // chromeos::CrasAudioHandler::AudioObserver overrides. | 526 // chromeos::CrasAudioHandler::AudioObserver overrides. |
| 527 void OnOutputMuteChanged(bool /* mute_on */) override { | 527 void OnOutputMuteChanged(bool /* mute_on */, |
| 528 bool /* system_adjust */) override { |
| 528 ++output_mute_changed_count_; | 529 ++output_mute_changed_count_; |
| 529 } | 530 } |
| 530 | 531 |
| 531 private: | 532 private: |
| 532 int output_mute_changed_count_; | 533 int output_mute_changed_count_; |
| 533 | 534 |
| 534 DISALLOW_COPY_AND_ASSIGN(TestAudioObserver); | 535 DISALLOW_COPY_AND_ASSIGN(TestAudioObserver); |
| 535 }; | 536 }; |
| 536 #endif | 537 #endif |
| 537 | 538 |
| (...skipping 3321 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3859 | 3860 |
| 3860 IN_PROC_BROWSER_TEST_F(HardwareAccelerationModePolicyTest, | 3861 IN_PROC_BROWSER_TEST_F(HardwareAccelerationModePolicyTest, |
| 3861 HardwareAccelerationDisabled) { | 3862 HardwareAccelerationDisabled) { |
| 3862 // Verifies that hardware acceleration can be disabled with policy. | 3863 // Verifies that hardware acceleration can be disabled with policy. |
| 3863 EXPECT_FALSE( | 3864 EXPECT_FALSE( |
| 3864 content::GpuDataManager::GetInstance()->GpuAccessAllowed(nullptr)); | 3865 content::GpuDataManager::GetInstance()->GpuAccessAllowed(nullptr)); |
| 3865 } | 3866 } |
| 3866 #endif // !defined(OS_CHROMEOS) && !defined(OS_ANDROID) | 3867 #endif // !defined(OS_CHROMEOS) && !defined(OS_ANDROID) |
| 3867 | 3868 |
| 3868 } // namespace policy | 3869 } // namespace policy |
| OLD | NEW |