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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/browser/media/session/audio_focus_manager_unittest.cc

Issue 2291163002: Let MediaSession store duck state instead of volume multiplier (Closed)
Patch Set: addressed Anton's comments Created 4 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/media/session/audio_focus_manager.cc ('k') | content/browser/media/session/media_session.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/media/session/audio_focus_manager_unittest.cc
diff --git a/content/browser/media/session/audio_focus_manager_unittest.cc b/content/browser/media/session/audio_focus_manager_unittest.cc
index 71e8a6c6875fed17625414b27ae4af6da343cec6..11bf186aa837b9dd44b11cda8fdcd1bd7767eef4 100644
--- a/content/browser/media/session/audio_focus_manager_unittest.cc
+++ b/content/browser/media/session/audio_focus_manager_unittest.cc
@@ -17,9 +17,6 @@ using SuspendType = MediaSession::SuspendType;
class AudioFocusManagerTest : public testing::Test {
public:
- const double kDuckingVolumeMultiplier = 0.2;
- const double kDefaultVolumeMultiplier = 1.0;
-
AudioFocusManagerTest() : ui_thread_(BrowserThread::UI, &message_loop_) {}
void SetUp() override {
@@ -44,8 +41,8 @@ class AudioFocusManagerTest : public testing::Test {
return AudioFocusManager::GetInstance()->TransientMayDuckEntriesCount();
}
- double GetVolumeMultiplier(MediaSession* session) {
- return session->volume_multiplier_;
+ double IsSessionDucking(MediaSession* session) {
+ return session->is_ducking_; // Quack! Quack!
}
WebContents* CreateWebContents() {
@@ -135,7 +132,7 @@ TEST_F(AudioFocusManagerTest, RequestAudioFocusTransient_FromGain) {
media_session, AudioFocusManager::AudioFocusType::GainTransientMayDuck);
ASSERT_EQ(nullptr, GetAudioFocusedContent());
ASSERT_EQ(1, GetTransientMaybeDuckCount());
- ASSERT_EQ(kDefaultVolumeMultiplier, GetVolumeMultiplier(media_session));
+ ASSERT_FALSE(IsSessionDucking(media_session));
}
TEST_F(AudioFocusManagerTest, RequestAudioFocusTransient_FromGainWhileDucking) {
@@ -148,17 +145,17 @@ TEST_F(AudioFocusManagerTest, RequestAudioFocusTransient_FromGainWhileDucking) {
AudioFocusManager::GetInstance()->RequestAudioFocus(
media_session_1, AudioFocusManager::AudioFocusType::Gain);
ASSERT_EQ(0, GetTransientMaybeDuckCount());
- ASSERT_EQ(kDefaultVolumeMultiplier, GetVolumeMultiplier(media_session_1));
+ ASSERT_FALSE(IsSessionDucking(media_session_1));
AudioFocusManager::GetInstance()->RequestAudioFocus(
media_session_2, AudioFocusManager::AudioFocusType::GainTransientMayDuck);
ASSERT_EQ(1, GetTransientMaybeDuckCount());
- ASSERT_EQ(kDuckingVolumeMultiplier, GetVolumeMultiplier(media_session_1));
+ ASSERT_TRUE(IsSessionDucking(media_session_1));
AudioFocusManager::GetInstance()->RequestAudioFocus(
media_session_1, AudioFocusManager::AudioFocusType::GainTransientMayDuck);
ASSERT_EQ(2, GetTransientMaybeDuckCount());
- ASSERT_EQ(kDefaultVolumeMultiplier, GetVolumeMultiplier(media_session_1));
+ ASSERT_FALSE(IsSessionDucking(media_session_1));
}
TEST_F(AudioFocusManagerTest, AbandonAudioFocus_RemovesFocusedEntry) {
@@ -203,12 +200,12 @@ TEST_F(AudioFocusManagerTest, AbandonAudioFocus_WhileDuckingThenResume) {
AudioFocusManager::GetInstance()->RequestAudioFocus(
media_session_1, AudioFocusManager::AudioFocusType::Gain);
ASSERT_EQ(0, GetTransientMaybeDuckCount());
- ASSERT_EQ(kDefaultVolumeMultiplier, GetVolumeMultiplier(media_session_1));
+ ASSERT_FALSE(IsSessionDucking(media_session_1));
AudioFocusManager::GetInstance()->RequestAudioFocus(
media_session_2, AudioFocusManager::AudioFocusType::GainTransientMayDuck);
ASSERT_EQ(1, GetTransientMaybeDuckCount());
- ASSERT_EQ(kDuckingVolumeMultiplier, GetVolumeMultiplier(media_session_1));
+ ASSERT_TRUE(IsSessionDucking(media_session_1));
AudioFocusManager::GetInstance()->AbandonAudioFocus(media_session_1);
ASSERT_EQ(1, GetTransientMaybeDuckCount());
@@ -218,7 +215,7 @@ TEST_F(AudioFocusManagerTest, AbandonAudioFocus_WhileDuckingThenResume) {
AudioFocusManager::GetInstance()->RequestAudioFocus(
media_session_1, AudioFocusManager::AudioFocusType::Gain);
- ASSERT_EQ(kDefaultVolumeMultiplier, GetVolumeMultiplier(media_session_1));
+ ASSERT_FALSE(IsSessionDucking(media_session_1));
}
TEST_F(AudioFocusManagerTest, AbandonAudioFocus_StopsDucking) {
@@ -231,17 +228,16 @@ TEST_F(AudioFocusManagerTest, AbandonAudioFocus_StopsDucking) {
AudioFocusManager::GetInstance()->RequestAudioFocus(
media_session_1, AudioFocusManager::AudioFocusType::Gain);
ASSERT_EQ(0, GetTransientMaybeDuckCount());
- ASSERT_EQ(kDefaultVolumeMultiplier, GetVolumeMultiplier(media_session_1));
+ ASSERT_FALSE(IsSessionDucking(media_session_1));
AudioFocusManager::GetInstance()->RequestAudioFocus(
media_session_2, AudioFocusManager::AudioFocusType::GainTransientMayDuck);
ASSERT_EQ(1, GetTransientMaybeDuckCount());
- ASSERT_EQ(kDuckingVolumeMultiplier, GetVolumeMultiplier(media_session_1));
+ ASSERT_TRUE(IsSessionDucking(media_session_1));
AudioFocusManager::GetInstance()->AbandonAudioFocus(media_session_2);
ASSERT_EQ(0, GetTransientMaybeDuckCount());
- ASSERT_EQ(kDefaultVolumeMultiplier, GetVolumeMultiplier(media_session_1));
-
+ ASSERT_FALSE(IsSessionDucking(media_session_1));
}
TEST_F(AudioFocusManagerTest, DuckWhilePlaying) {
@@ -253,11 +249,11 @@ TEST_F(AudioFocusManagerTest, DuckWhilePlaying) {
AudioFocusManager::GetInstance()->RequestAudioFocus(
media_session_1, AudioFocusManager::AudioFocusType::Gain);
- ASSERT_EQ(kDefaultVolumeMultiplier, GetVolumeMultiplier(media_session_1));
+ ASSERT_FALSE(IsSessionDucking(media_session_1));
AudioFocusManager::GetInstance()->RequestAudioFocus(
media_session_2, AudioFocusManager::AudioFocusType::GainTransientMayDuck);
- ASSERT_EQ(kDuckingVolumeMultiplier, GetVolumeMultiplier(media_session_1));
+ ASSERT_TRUE(IsSessionDucking(media_session_1));
}
TEST_F(AudioFocusManagerTest, DuckWhenStarting) {
@@ -272,7 +268,7 @@ TEST_F(AudioFocusManagerTest, DuckWhenStarting) {
AudioFocusManager::GetInstance()->RequestAudioFocus(
media_session_1, AudioFocusManager::AudioFocusType::Gain);
- ASSERT_EQ(kDuckingVolumeMultiplier, GetVolumeMultiplier(media_session_1));
+ ASSERT_TRUE(IsSessionDucking(media_session_1));
}
TEST_F(AudioFocusManagerTest, DuckWithMultipleTransients) {
@@ -287,21 +283,21 @@ TEST_F(AudioFocusManagerTest, DuckWithMultipleTransients) {
AudioFocusManager::GetInstance()->RequestAudioFocus(
media_session_1, AudioFocusManager::AudioFocusType::Gain);
- ASSERT_EQ(kDefaultVolumeMultiplier, GetVolumeMultiplier(media_session_1));
+ ASSERT_FALSE(IsSessionDucking(media_session_1));
AudioFocusManager::GetInstance()->RequestAudioFocus(
media_session_2, AudioFocusManager::AudioFocusType::GainTransientMayDuck);
- ASSERT_EQ(kDuckingVolumeMultiplier, GetVolumeMultiplier(media_session_1));
+ ASSERT_TRUE(IsSessionDucking(media_session_1));
AudioFocusManager::GetInstance()->RequestAudioFocus(
media_session_3, AudioFocusManager::AudioFocusType::GainTransientMayDuck);
- ASSERT_EQ(kDuckingVolumeMultiplier, GetVolumeMultiplier(media_session_1));
+ ASSERT_TRUE(IsSessionDucking(media_session_1));
AudioFocusManager::GetInstance()->AbandonAudioFocus(media_session_2);
- ASSERT_EQ(kDuckingVolumeMultiplier, GetVolumeMultiplier(media_session_1));
+ ASSERT_TRUE(IsSessionDucking(media_session_1));
AudioFocusManager::GetInstance()->AbandonAudioFocus(media_session_3);
- ASSERT_EQ(kDefaultVolumeMultiplier, GetVolumeMultiplier(media_session_1));
+ ASSERT_FALSE(IsSessionDucking(media_session_1));
}
TEST_F(AudioFocusManagerTest, WebContentsDestroyed_ReleasesFocus) {
@@ -337,14 +333,14 @@ TEST_F(AudioFocusManagerTest, WebContentsDestroyed_StopsDucking) {
AudioFocusManager::GetInstance()->RequestAudioFocus(
media_session_1, AudioFocusManager::AudioFocusType::Gain);
- ASSERT_EQ(kDefaultVolumeMultiplier, GetVolumeMultiplier(media_session_1));
+ ASSERT_FALSE(IsSessionDucking(media_session_1));
AudioFocusManager::GetInstance()->RequestAudioFocus(
media_session_2, AudioFocusManager::AudioFocusType::GainTransientMayDuck);
- ASSERT_EQ(kDuckingVolumeMultiplier, GetVolumeMultiplier(media_session_1));
+ ASSERT_TRUE(IsSessionDucking(media_session_1));
web_contents_2.reset();
- ASSERT_EQ(kDefaultVolumeMultiplier, GetVolumeMultiplier(media_session_1));
+ ASSERT_FALSE(IsSessionDucking(media_session_1));
}
} // namespace content
« no previous file with comments | « content/browser/media/session/audio_focus_manager.cc ('k') | content/browser/media/session/media_session.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698