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

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: fixed build 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
« no previous file with comments | « 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 8c8c851208484f9c7ebaa8cd4bd0d141ae05f739..37827e1c3691e5c7aa1cbb9dc9d598b5272f035c 100644
--- a/content/browser/media/session/media_session_impl_browsertest.cc
+++ b/content/browser/media/session/media_session_impl_browsertest.cc
@@ -118,7 +118,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();
@@ -126,8 +126,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() {
@@ -309,7 +307,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) {
@@ -317,7 +315,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,
@@ -328,7 +326,7 @@ IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest,
SystemSuspend(true);
- EXPECT_FALSE(HasAudioFocus());
+ EXPECT_FALSE(IsActive());
}
IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest, StopGivesAwayAudioFocus) {
@@ -338,7 +336,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) {
@@ -349,7 +347,7 @@ IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest, ResumeGivesBackAudioFocus) {
SystemSuspend(true);
SystemResume();
- EXPECT_TRUE(HasAudioFocus());
+ EXPECT_TRUE(IsActive());
}
IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest,
@@ -361,11 +359,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,
@@ -379,11 +377,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,
@@ -397,9 +395,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) {
@@ -408,11 +406,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,
@@ -528,7 +526,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,
@@ -542,7 +540,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) {
@@ -559,7 +557,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,
@@ -575,7 +573,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,
@@ -594,7 +592,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,
@@ -612,7 +610,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,
@@ -631,12 +629,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,
@@ -655,7 +653,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,
@@ -674,12 +672,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,
@@ -697,7 +695,7 @@ IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest,
SystemSuspend(true);
EXPECT_TRUE(IsControllable());
- EXPECT_TRUE(IsSuspended());
+ EXPECT_FALSE(IsActive());
}
IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest,
@@ -718,7 +716,7 @@ IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest,
SystemResume();
EXPECT_TRUE(IsControllable());
- EXPECT_FALSE(IsSuspended());
+ EXPECT_TRUE(IsActive());
}
IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest,
@@ -736,7 +734,7 @@ IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest,
SystemSuspend(false);
EXPECT_FALSE(IsControllable());
- EXPECT_TRUE(IsSuspended());
+ EXPECT_FALSE(IsActive());
}
IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest,
@@ -757,7 +755,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,
@@ -781,7 +779,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,
@@ -804,7 +802,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,
@@ -827,7 +825,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,
@@ -844,7 +842,7 @@ IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest,
UISuspend();
EXPECT_TRUE(IsControllable());
- EXPECT_TRUE(IsSuspended());
+ EXPECT_FALSE(IsActive());
}
IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest,
@@ -865,7 +863,7 @@ IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest,
UIResume();
EXPECT_TRUE(IsControllable());
- EXPECT_FALSE(IsSuspended());
+ EXPECT_TRUE(IsActive());
}
IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest,
@@ -878,15 +876,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,
@@ -906,7 +904,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,
@@ -927,7 +925,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,
@@ -941,7 +939,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());
}
@@ -954,11 +952,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,
@@ -969,11 +967,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) {
@@ -983,11 +981,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) {
@@ -997,11 +995,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) {
« no previous file with comments | « 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