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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2758773003: Clean up MediaSessionImpl state interfaces (Closed)
Patch Set: Created 3 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 side-by-side diff with in-line comments
Download patch
« content/browser/media/session/media_session_impl.h ('K') | « content/browser/media/session/media_session_impl.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/media/session/media_session_impl_browsertest.cc
diff --git a/content/browser/media/session/media_session_impl_browsertest.cc b/content/browser/media/session/media_session_impl_browsertest.cc
index 7b461af1d982efae6b092939133788ca94835b77..5c2589f5d3c944f3f8461f6db0134e57a74daacf 100644
--- a/content/browser/media/session/media_session_impl_browsertest.cc
+++ b/content/browser/media/session/media_session_impl_browsertest.cc
@@ -115,7 +115,7 @@ class MediaSessionImplBrowserTest : public content::ContentBrowserTest {
media_session_->OnPlayerPaused(player_observer, player_id);
}
- bool HasAudioFocus() { return media_session_->IsActiveForTest(); }
+ bool IsActive() { return media_session_->IsActive(); }
content::AudioFocusManager::AudioFocusType GetSessionAudioFocusType() {
return media_session_->audio_focus_type();
@@ -123,8 +123,6 @@ class MediaSessionImplBrowserTest : public content::ContentBrowserTest {
bool IsControllable() { return media_session_->IsControllable(); }
- bool IsSuspended() { return media_session_->IsSuspended(); }
-
void UIResume() { media_session_->Resume(MediaSession::SuspendType::UI); }
void SystemResume() {
@@ -306,7 +304,7 @@ IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest,
}
IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest, AudioFocusInitialState) {
- EXPECT_FALSE(HasAudioFocus());
+ EXPECT_FALSE(IsActive());
}
IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest, StartPlayerGivesFocus) {
@@ -314,7 +312,7 @@ IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest, StartPlayerGivesFocus) {
StartNewPlayer(player_observer.get(), media::MediaContentType::Persistent);
- EXPECT_TRUE(HasAudioFocus());
+ EXPECT_TRUE(IsActive());
}
IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest,
@@ -325,7 +323,7 @@ IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest,
SystemSuspend(true);
- EXPECT_FALSE(HasAudioFocus());
+ EXPECT_FALSE(IsActive());
}
IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest, StopGivesAwayAudioFocus) {
@@ -335,7 +333,7 @@ IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest, StopGivesAwayAudioFocus) {
media_session_->Stop(MediaSession::SuspendType::UI);
- EXPECT_FALSE(HasAudioFocus());
+ EXPECT_FALSE(IsActive());
}
IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest, ResumeGivesBackAudioFocus) {
@@ -346,7 +344,7 @@ IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest, ResumeGivesBackAudioFocus) {
SystemSuspend(true);
SystemResume();
- EXPECT_TRUE(HasAudioFocus());
+ EXPECT_TRUE(IsActive());
}
IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest,
@@ -358,11 +356,11 @@ IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest,
StartNewPlayer(player_observer.get(), media::MediaContentType::Persistent);
RemovePlayer(player_observer.get(), 0);
- EXPECT_TRUE(HasAudioFocus());
+ EXPECT_TRUE(IsActive());
RemovePlayer(player_observer.get(), 1);
- EXPECT_TRUE(HasAudioFocus());
+ EXPECT_TRUE(IsActive());
RemovePlayer(player_observer.get(), 2);
- EXPECT_FALSE(HasAudioFocus());
+ EXPECT_FALSE(IsActive());
}
IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest,
@@ -376,11 +374,11 @@ IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest,
StartNewPlayer(player_observer_3.get(), media::MediaContentType::Persistent);
RemovePlayer(player_observer_1.get(), 0);
- EXPECT_TRUE(HasAudioFocus());
+ EXPECT_TRUE(IsActive());
RemovePlayer(player_observer_2.get(), 0);
- EXPECT_TRUE(HasAudioFocus());
+ EXPECT_TRUE(IsActive());
RemovePlayer(player_observer_3.get(), 0);
- EXPECT_FALSE(HasAudioFocus());
+ EXPECT_FALSE(IsActive());
}
IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest,
@@ -394,9 +392,9 @@ IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest,
StartNewPlayer(player_observer_2.get(), media::MediaContentType::Persistent);
RemovePlayers(player_observer_1.get());
- EXPECT_TRUE(HasAudioFocus());
+ EXPECT_TRUE(IsActive());
RemovePlayers(player_observer_2.get());
- EXPECT_FALSE(HasAudioFocus());
+ EXPECT_FALSE(IsActive());
}
IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest, ResumePlayGivesAudioFocus) {
@@ -405,11 +403,11 @@ IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest, ResumePlayGivesAudioFocus) {
StartNewPlayer(player_observer.get(), media::MediaContentType::Persistent);
RemovePlayer(player_observer.get(), 0);
- EXPECT_FALSE(HasAudioFocus());
+ EXPECT_FALSE(IsActive());
EXPECT_TRUE(
AddPlayer(player_observer.get(), 0, media::MediaContentType::Persistent));
- EXPECT_TRUE(HasAudioFocus());
+ EXPECT_TRUE(IsActive());
}
IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest,
@@ -525,7 +523,7 @@ IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest, ControlsShowForContent) {
StartNewPlayer(player_observer.get(), media::MediaContentType::Persistent);
EXPECT_TRUE(IsControllable());
- EXPECT_FALSE(IsSuspended());
+ EXPECT_TRUE(IsActive());
}
IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest,
@@ -539,7 +537,7 @@ IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest,
StartNewPlayer(player_observer.get(), media::MediaContentType::Transient);
EXPECT_FALSE(IsControllable());
- EXPECT_FALSE(IsSuspended());
+ EXPECT_TRUE(IsActive());
}
IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest, ControlsHideWhenStopped) {
@@ -556,7 +554,7 @@ IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest, ControlsHideWhenStopped) {
RemovePlayers(player_observer.get());
EXPECT_FALSE(IsControllable());
- EXPECT_TRUE(IsSuspended());
+ EXPECT_FALSE(IsActive());
}
IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest,
@@ -572,7 +570,7 @@ IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest,
StartNewPlayer(player_observer.get(), media::MediaContentType::Transient);
EXPECT_TRUE(IsControllable());
- EXPECT_FALSE(IsSuspended());
+ EXPECT_TRUE(IsActive());
}
IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest,
@@ -591,7 +589,7 @@ IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest,
StartNewPlayer(player_observer.get(), media::MediaContentType::Persistent);
EXPECT_TRUE(IsControllable());
- EXPECT_FALSE(IsSuspended());
+ EXPECT_TRUE(IsActive());
}
IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest,
@@ -609,7 +607,7 @@ IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest,
RemovePlayer(player_observer.get(), 0);
EXPECT_TRUE(IsControllable());
- EXPECT_FALSE(IsSuspended());
+ EXPECT_TRUE(IsActive());
}
IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest,
@@ -628,12 +626,12 @@ IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest,
RemovePlayer(player_observer.get(), 0);
EXPECT_TRUE(IsControllable());
- EXPECT_FALSE(IsSuspended());
+ EXPECT_TRUE(IsActive());
RemovePlayer(player_observer.get(), 1);
EXPECT_FALSE(IsControllable());
- EXPECT_TRUE(IsSuspended());
+ EXPECT_FALSE(IsActive());
}
IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest,
@@ -652,7 +650,7 @@ IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest,
RemovePlayers(player_observer.get());
EXPECT_FALSE(IsControllable());
- EXPECT_TRUE(IsSuspended());
+ EXPECT_FALSE(IsActive());
}
IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest,
@@ -671,12 +669,12 @@ IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest,
OnPlayerPaused(player_observer.get(), 0);
EXPECT_TRUE(IsControllable());
- EXPECT_FALSE(IsSuspended());
+ EXPECT_TRUE(IsActive());
OnPlayerPaused(player_observer.get(), 1);
EXPECT_TRUE(IsControllable());
- EXPECT_TRUE(IsSuspended());
+ EXPECT_FALSE(IsActive());
}
IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest,
@@ -694,7 +692,7 @@ IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest,
SystemSuspend(true);
EXPECT_TRUE(IsControllable());
- EXPECT_TRUE(IsSuspended());
+ EXPECT_FALSE(IsActive());
}
IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest,
@@ -715,7 +713,7 @@ IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest,
SystemResume();
EXPECT_TRUE(IsControllable());
- EXPECT_FALSE(IsSuspended());
+ EXPECT_TRUE(IsActive());
}
IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest,
@@ -733,7 +731,7 @@ IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest,
SystemSuspend(false);
EXPECT_FALSE(IsControllable());
- EXPECT_TRUE(IsSuspended());
+ EXPECT_FALSE(IsActive());
}
IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest,
@@ -754,7 +752,7 @@ IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest,
media_session_->Stop(MediaSession::SuspendType::UI);
EXPECT_FALSE(IsControllable());
- EXPECT_TRUE(IsSuspended());
+ EXPECT_FALSE(IsActive());
}
IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest,
@@ -778,7 +776,7 @@ IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest,
StartNewPlayer(player_observer.get(), media::MediaContentType::Transient);
EXPECT_FALSE(IsControllable());
- EXPECT_FALSE(IsSuspended());
+ EXPECT_TRUE(IsActive());
}
IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest,
@@ -801,7 +799,7 @@ IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest,
StartNewPlayer(player_observer.get(), media::MediaContentType::Persistent);
EXPECT_TRUE(IsControllable());
- EXPECT_FALSE(IsSuspended());
+ EXPECT_TRUE(IsActive());
}
IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest,
@@ -824,7 +822,7 @@ IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest,
AddPlayer(player_observer.get(), 0, media::MediaContentType::Persistent);
EXPECT_TRUE(IsControllable());
- EXPECT_FALSE(IsSuspended());
+ EXPECT_TRUE(IsActive());
}
IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest,
@@ -841,7 +839,7 @@ IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest,
UISuspend();
EXPECT_TRUE(IsControllable());
- EXPECT_TRUE(IsSuspended());
+ EXPECT_FALSE(IsActive());
}
IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest,
@@ -862,7 +860,7 @@ IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest,
UIResume();
EXPECT_TRUE(IsControllable());
- EXPECT_FALSE(IsSuspended());
+ EXPECT_TRUE(IsActive());
}
IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest,
@@ -875,15 +873,15 @@ IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest,
StartNewPlayer(player_observer.get(), media::MediaContentType::OneShot);
EXPECT_FALSE(IsControllable());
- EXPECT_FALSE(IsSuspended());
+ EXPECT_TRUE(IsActive());
StartNewPlayer(player_observer.get(), media::MediaContentType::Transient);
EXPECT_FALSE(IsControllable());
- EXPECT_FALSE(IsSuspended());
+ EXPECT_TRUE(IsActive());
StartNewPlayer(player_observer.get(), media::MediaContentType::Persistent);
EXPECT_FALSE(IsControllable());
- EXPECT_FALSE(IsSuspended());
+ EXPECT_TRUE(IsActive());
}
IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest,
@@ -903,7 +901,7 @@ IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest,
RemovePlayer(player_observer.get(), 0);
EXPECT_FALSE(IsControllable());
- EXPECT_TRUE(IsSuspended());
+ EXPECT_FALSE(IsActive());
}
IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest,
@@ -924,7 +922,7 @@ IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest,
RemovePlayer(player_observer.get(), 0);
EXPECT_TRUE(IsControllable());
- EXPECT_FALSE(IsSuspended());
+ EXPECT_TRUE(IsActive());
}
IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest,
@@ -938,7 +936,7 @@ IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest,
SystemSuspend(false);
EXPECT_FALSE(IsControllable());
- EXPECT_FALSE(IsSuspended());
+ EXPECT_TRUE(IsActive());
EXPECT_EQ(0, player_observer->received_suspend_calls());
}
@@ -951,11 +949,11 @@ IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest,
UISuspend();
EXPECT_TRUE(IsControllable());
- EXPECT_TRUE(IsSuspended());
+ EXPECT_FALSE(IsActive());
SystemResume();
EXPECT_TRUE(IsControllable());
- EXPECT_TRUE(IsSuspended());
+ EXPECT_FALSE(IsActive());
}
IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest,
@@ -966,11 +964,11 @@ IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest,
SystemSuspend(true);
EXPECT_TRUE(IsControllable());
- EXPECT_TRUE(IsSuspended());
+ EXPECT_FALSE(IsActive());
UIResume();
EXPECT_TRUE(IsControllable());
- EXPECT_FALSE(IsSuspended());
+ EXPECT_TRUE(IsActive());
}
IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest, ResumeSuspendFromUI) {
@@ -980,11 +978,11 @@ IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest, ResumeSuspendFromUI) {
UISuspend();
EXPECT_TRUE(IsControllable());
- EXPECT_TRUE(IsSuspended());
+ EXPECT_FALSE(IsActive());
UIResume();
EXPECT_TRUE(IsControllable());
- EXPECT_FALSE(IsSuspended());
+ EXPECT_TRUE(IsActive());
}
IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest, ResumeSuspendFromSystem) {
@@ -994,11 +992,11 @@ IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest, ResumeSuspendFromSystem) {
SystemSuspend(true);
EXPECT_TRUE(IsControllable());
- EXPECT_TRUE(IsSuspended());
+ EXPECT_FALSE(IsActive());
SystemResume();
EXPECT_TRUE(IsControllable());
- EXPECT_FALSE(IsSuspended());
+ EXPECT_TRUE(IsActive());
}
IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest, OneShotTakesGainFocus) {
« content/browser/media/session/media_session_impl.h ('K') | « content/browser/media/session/media_session_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698