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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1996043002: Split MediaContentType and AudioFocusType (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fixed desktop build & tests Created 4 years, 5 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.h ('K') | « content/browser/media/session/media_session.cc ('k') | content/browser/media/session/media_session_controller.h » ('j') | content/renderer/media/webmediaplayer_ms.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/media/session/media_session_browsertest.cc
diff --git a/content/browser/media/session/media_session_browsertest.cc b/content/browser/media/session/media_session_browsertest.cc
index cfbf1e77dcbccb061e2e7597f126c2bc31ed3566..606512e61760889fd3303dbdcd671e5f821f2151 100644
--- a/content/browser/media/session/media_session_browsertest.cc
+++ b/content/browser/media/session/media_session_browsertest.cc
@@ -19,6 +19,7 @@
#include "content/public/browser/web_contents_observer.h"
#include "content/public/test/content_browser_test.h"
#include "content/shell/browser/shell.h"
+#include "media/base/media_content_type.h"
#include "testing/gmock/include/gmock/gmock.h"
using content::WebContents;
@@ -35,9 +36,7 @@ namespace {
class MockMediaSessionDelegate : public MediaSessionDelegate {
public:
- bool RequestAudioFocus(MediaSession::Type) override {
- return true;
- }
+ bool RequestAudioFocus(MediaSession::AudioFocusType) override { return true; }
void AbandonAudioFocus() override {
}
@@ -80,7 +79,7 @@ class MediaSessionBrowserTest : public content::ContentBrowserTest {
}
void StartNewPlayer(MockMediaSessionObserver* media_session_observer,
- MediaSession::Type type) {
+ media::MediaContentType type) {
bool result = AddPlayer(
media_session_observer,
media_session_observer->StartNewPlayer(),
@@ -90,7 +89,7 @@ class MediaSessionBrowserTest : public content::ContentBrowserTest {
bool AddPlayer(MockMediaSessionObserver* media_session_observer,
int player_id,
- MediaSession::Type type) {
+ media::MediaContentType type) {
return media_session_->AddPlayer(media_session_observer, player_id, type);
}
@@ -110,7 +109,7 @@ class MediaSessionBrowserTest : public content::ContentBrowserTest {
bool HasAudioFocus() { return media_session_->IsActiveForTest(); }
- MediaSession::Type GetSessionType() {
+ MediaSession::AudioFocusType GetSessionType() {
return media_session_->audio_focus_type_for_test();
}
@@ -165,9 +164,12 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
std::unique_ptr<MockMediaSessionObserver> media_session_observer(
new MockMediaSessionObserver);
- StartNewPlayer(media_session_observer.get(), MediaSession::Type::Content);
- StartNewPlayer(media_session_observer.get(), MediaSession::Type::Content);
- StartNewPlayer(media_session_observer.get(), MediaSession::Type::Content);
+ StartNewPlayer(media_session_observer.get(),
+ media::MediaContentType::Content);
+ StartNewPlayer(media_session_observer.get(),
+ media::MediaContentType::Content);
+ StartNewPlayer(media_session_observer.get(),
+ media::MediaContentType::Content);
EXPECT_TRUE(media_session_observer->IsPlaying(0));
EXPECT_TRUE(media_session_observer->IsPlaying(1));
@@ -183,9 +185,12 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
std::unique_ptr<MockMediaSessionObserver> media_session_observer_3(
new MockMediaSessionObserver);
- StartNewPlayer(media_session_observer_1.get(), MediaSession::Type::Content);
- StartNewPlayer(media_session_observer_2.get(), MediaSession::Type::Content);
- StartNewPlayer(media_session_observer_3.get(), MediaSession::Type::Content);
+ StartNewPlayer(media_session_observer_1.get(),
+ media::MediaContentType::Content);
+ StartNewPlayer(media_session_observer_2.get(),
+ media::MediaContentType::Content);
+ StartNewPlayer(media_session_observer_3.get(),
+ media::MediaContentType::Content);
EXPECT_TRUE(media_session_observer_1->IsPlaying(0));
EXPECT_TRUE(media_session_observer_2->IsPlaying(0));
@@ -197,9 +202,12 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
std::unique_ptr<MockMediaSessionObserver> media_session_observer(
new MockMediaSessionObserver);
- StartNewPlayer(media_session_observer.get(), MediaSession::Type::Content);
- StartNewPlayer(media_session_observer.get(), MediaSession::Type::Content);
- StartNewPlayer(media_session_observer.get(), MediaSession::Type::Content);
+ StartNewPlayer(media_session_observer.get(),
+ media::MediaContentType::Content);
+ StartNewPlayer(media_session_observer.get(),
+ media::MediaContentType::Content);
+ StartNewPlayer(media_session_observer.get(),
+ media::MediaContentType::Content);
SystemSuspend(true);
@@ -213,9 +221,12 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
std::unique_ptr<MockMediaSessionObserver> media_session_observer(
new MockMediaSessionObserver);
- StartNewPlayer(media_session_observer.get(), MediaSession::Type::Content);
- StartNewPlayer(media_session_observer.get(), MediaSession::Type::Content);
- StartNewPlayer(media_session_observer.get(), MediaSession::Type::Content);
+ StartNewPlayer(media_session_observer.get(),
+ media::MediaContentType::Content);
+ StartNewPlayer(media_session_observer.get(),
+ media::MediaContentType::Content);
+ StartNewPlayer(media_session_observer.get(),
+ media::MediaContentType::Content);
SystemSuspend(true);
SystemResume();
@@ -230,7 +241,8 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
std::unique_ptr<MockMediaSessionObserver> media_session_observer(
new MockMediaSessionObserver);
- StartNewPlayer(media_session_observer.get(), MediaSession::Type::Content);
+ StartNewPlayer(media_session_observer.get(),
+ media::MediaContentType::Content);
EXPECT_TRUE(media_session_observer->IsPlaying(0));
@@ -238,12 +250,14 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
EXPECT_FALSE(media_session_observer->IsPlaying(0));
- StartNewPlayer(media_session_observer.get(), MediaSession::Type::Content);
+ StartNewPlayer(media_session_observer.get(),
+ media::MediaContentType::Content);
EXPECT_FALSE(media_session_observer->IsPlaying(0));
EXPECT_TRUE(media_session_observer->IsPlaying(1));
- StartNewPlayer(media_session_observer.get(), MediaSession::Type::Content);
+ StartNewPlayer(media_session_observer.get(),
+ media::MediaContentType::Content);
EXPECT_FALSE(media_session_observer->IsPlaying(0));
EXPECT_TRUE(media_session_observer->IsPlaying(1));
@@ -255,8 +269,10 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
std::unique_ptr<MockMediaSessionObserver> media_session_observer(
new MockMediaSessionObserver);
- StartNewPlayer(media_session_observer.get(), MediaSession::Type::Content);
- StartNewPlayer(media_session_observer.get(), MediaSession::Type::Content);
+ StartNewPlayer(media_session_observer.get(),
+ media::MediaContentType::Content);
+ StartNewPlayer(media_session_observer.get(),
+ media::MediaContentType::Content);
double volume_multiplier = 0.2f;
SystemSetVolumeMultiplier(volume_multiplier);
@@ -264,7 +280,8 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
EXPECT_EQ(volume_multiplier, media_session_observer->GetVolumeMultiplier(0));
EXPECT_EQ(volume_multiplier, media_session_observer->GetVolumeMultiplier(1));
- StartNewPlayer(media_session_observer.get(), MediaSession::Type::Content);
+ StartNewPlayer(media_session_observer.get(),
+ media::MediaContentType::Content);
EXPECT_EQ(volume_multiplier, media_session_observer->GetVolumeMultiplier(2));
}
@@ -277,7 +294,8 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest, StartPlayerGivesFocus) {
std::unique_ptr<MockMediaSessionObserver> media_session_observer(
new MockMediaSessionObserver);
- StartNewPlayer(media_session_observer.get(), MediaSession::Type::Content);
+ StartNewPlayer(media_session_observer.get(),
+ media::MediaContentType::Content);
EXPECT_TRUE(HasAudioFocus());
}
@@ -286,7 +304,8 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest, SuspendGivesAwayAudioFocus) {
std::unique_ptr<MockMediaSessionObserver> media_session_observer(
new MockMediaSessionObserver);
- StartNewPlayer(media_session_observer.get(), MediaSession::Type::Content);
+ StartNewPlayer(media_session_observer.get(),
+ media::MediaContentType::Content);
SystemSuspend(true);
@@ -297,7 +316,8 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest, StopGivesAwayAudioFocus) {
std::unique_ptr<MockMediaSessionObserver> media_session_observer(
new MockMediaSessionObserver);
- StartNewPlayer(media_session_observer.get(), MediaSession::Type::Content);
+ StartNewPlayer(media_session_observer.get(),
+ media::MediaContentType::Content);
media_session_->Stop(MediaSession::SuspendType::UI);
@@ -308,7 +328,8 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest, ResumeGivesBackAudioFocus) {
std::unique_ptr<MockMediaSessionObserver> media_session_observer(
new MockMediaSessionObserver);
- StartNewPlayer(media_session_observer.get(), MediaSession::Type::Content);
+ StartNewPlayer(media_session_observer.get(),
+ media::MediaContentType::Content);
SystemSuspend(true);
SystemResume();
@@ -321,9 +342,12 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
std::unique_ptr<MockMediaSessionObserver> media_session_observer(
new MockMediaSessionObserver);
- StartNewPlayer(media_session_observer.get(), MediaSession::Type::Content);
- StartNewPlayer(media_session_observer.get(), MediaSession::Type::Content);
- StartNewPlayer(media_session_observer.get(), MediaSession::Type::Content);
+ StartNewPlayer(media_session_observer.get(),
+ media::MediaContentType::Content);
+ StartNewPlayer(media_session_observer.get(),
+ media::MediaContentType::Content);
+ StartNewPlayer(media_session_observer.get(),
+ media::MediaContentType::Content);
RemovePlayer(media_session_observer.get(), 0);
EXPECT_TRUE(HasAudioFocus());
@@ -342,9 +366,12 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
std::unique_ptr<MockMediaSessionObserver> media_session_observer_3(
new MockMediaSessionObserver);
- StartNewPlayer(media_session_observer_1.get(), MediaSession::Type::Content);
- StartNewPlayer(media_session_observer_2.get(), MediaSession::Type::Content);
- StartNewPlayer(media_session_observer_3.get(), MediaSession::Type::Content);
+ StartNewPlayer(media_session_observer_1.get(),
+ media::MediaContentType::Content);
+ StartNewPlayer(media_session_observer_2.get(),
+ media::MediaContentType::Content);
+ StartNewPlayer(media_session_observer_3.get(),
+ media::MediaContentType::Content);
RemovePlayer(media_session_observer_1.get(), 0);
EXPECT_TRUE(HasAudioFocus());
@@ -361,10 +388,14 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
std::unique_ptr<MockMediaSessionObserver> media_session_observer_2(
new MockMediaSessionObserver);
- StartNewPlayer(media_session_observer_1.get(), MediaSession::Type::Content);
- StartNewPlayer(media_session_observer_1.get(), MediaSession::Type::Content);
- StartNewPlayer(media_session_observer_2.get(), MediaSession::Type::Content);
- StartNewPlayer(media_session_observer_2.get(), MediaSession::Type::Content);
+ StartNewPlayer(media_session_observer_1.get(),
+ media::MediaContentType::Content);
+ StartNewPlayer(media_session_observer_1.get(),
+ media::MediaContentType::Content);
+ StartNewPlayer(media_session_observer_2.get(),
+ media::MediaContentType::Content);
+ StartNewPlayer(media_session_observer_2.get(),
+ media::MediaContentType::Content);
RemovePlayers(media_session_observer_1.get());
EXPECT_TRUE(HasAudioFocus());
@@ -376,13 +407,14 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest, ResumePlayGivesAudioFocus) {
std::unique_ptr<MockMediaSessionObserver> media_session_observer(
new MockMediaSessionObserver);
- StartNewPlayer(media_session_observer.get(), MediaSession::Type::Content);
+ StartNewPlayer(media_session_observer.get(),
+ media::MediaContentType::Content);
RemovePlayer(media_session_observer.get(), 0);
EXPECT_FALSE(HasAudioFocus());
- EXPECT_TRUE(
- AddPlayer(media_session_observer.get(), 0, MediaSession::Type::Content));
+ EXPECT_TRUE(AddPlayer(media_session_observer.get(), 0,
+ media::MediaContentType::Content));
EXPECT_TRUE(HasAudioFocus());
}
@@ -391,9 +423,12 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
std::unique_ptr<MockMediaSessionObserver> media_session_observer(
new MockMediaSessionObserver);
- StartNewPlayer(media_session_observer.get(), MediaSession::Type::Content);
- StartNewPlayer(media_session_observer.get(), MediaSession::Type::Content);
- StartNewPlayer(media_session_observer.get(), MediaSession::Type::Content);
+ StartNewPlayer(media_session_observer.get(),
+ media::MediaContentType::Content);
+ StartNewPlayer(media_session_observer.get(),
+ media::MediaContentType::Content);
+ StartNewPlayer(media_session_observer.get(),
+ media::MediaContentType::Content);
EXPECT_EQ(0, media_session_observer->received_suspend_calls());
EXPECT_EQ(0, media_session_observer->received_resume_calls());
@@ -410,17 +445,20 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
std::unique_ptr<MockMediaSessionObserver> media_session_observer(
new MockMediaSessionObserver);
- StartNewPlayer(media_session_observer.get(), MediaSession::Type::Content);
- StartNewPlayer(media_session_observer.get(), MediaSession::Type::Content);
- StartNewPlayer(media_session_observer.get(), MediaSession::Type::Content);
+ StartNewPlayer(media_session_observer.get(),
+ media::MediaContentType::Content);
+ StartNewPlayer(media_session_observer.get(),
+ media::MediaContentType::Content);
+ StartNewPlayer(media_session_observer.get(),
+ media::MediaContentType::Content);
// Adding the three players above again.
- EXPECT_TRUE(
- AddPlayer(media_session_observer.get(), 0, MediaSession::Type::Content));
- EXPECT_TRUE(
- AddPlayer(media_session_observer.get(), 1, MediaSession::Type::Content));
- EXPECT_TRUE(
- AddPlayer(media_session_observer.get(), 2, MediaSession::Type::Content));
+ EXPECT_TRUE(AddPlayer(media_session_observer.get(), 0,
+ media::MediaContentType::Content));
+ EXPECT_TRUE(AddPlayer(media_session_observer.get(), 1,
+ media::MediaContentType::Content));
+ EXPECT_TRUE(AddPlayer(media_session_observer.get(), 2,
+ media::MediaContentType::Content));
EXPECT_EQ(0, media_session_observer->received_suspend_calls());
EXPECT_EQ(0, media_session_observer->received_resume_calls());
@@ -437,7 +475,8 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
std::unique_ptr<MockMediaSessionObserver> media_session_observer(
new MockMediaSessionObserver);
- StartNewPlayer(media_session_observer.get(), MediaSession::Type::Content);
+ StartNewPlayer(media_session_observer.get(),
+ media::MediaContentType::Content);
RemovePlayer(media_session_observer.get(), 0);
RemovePlayer(media_session_observer.get(), 0);
@@ -448,20 +487,24 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest, MediaSessionType) {
new MockMediaSessionObserver);
// Starting a player with a given type should set the session to that type.
- StartNewPlayer(media_session_observer.get(), MediaSession::Type::Transient);
- EXPECT_EQ(MediaSession::Type::Transient, GetSessionType());
+ StartNewPlayer(media_session_observer.get(),
+ media::MediaContentType::Transient);
+ EXPECT_EQ(MediaSession::AudioFocusType::Transient, GetSessionType());
// Adding a player of the same type should have no effect on the type.
- StartNewPlayer(media_session_observer.get(), MediaSession::Type::Transient);
- EXPECT_EQ(MediaSession::Type::Transient, GetSessionType());
+ StartNewPlayer(media_session_observer.get(),
+ media::MediaContentType::Transient);
+ EXPECT_EQ(MediaSession::AudioFocusType::Transient, GetSessionType());
// Adding a player of Content type should override the current type.
- StartNewPlayer(media_session_observer.get(), MediaSession::Type::Content);
- EXPECT_EQ(MediaSession::Type::Content, GetSessionType());
+ StartNewPlayer(media_session_observer.get(),
+ media::MediaContentType::Content);
+ EXPECT_EQ(MediaSession::AudioFocusType::Content, GetSessionType());
// Adding a player of the Transient type should have no effect on the type.
- StartNewPlayer(media_session_observer.get(), MediaSession::Type::Transient);
- EXPECT_EQ(MediaSession::Type::Content, GetSessionType());
+ StartNewPlayer(media_session_observer.get(),
+ media::MediaContentType::Transient);
+ EXPECT_EQ(MediaSession::AudioFocusType::Content, GetSessionType());
EXPECT_TRUE(media_session_observer->IsPlaying(0));
EXPECT_TRUE(media_session_observer->IsPlaying(1));
@@ -475,7 +518,7 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest, MediaSessionType) {
EXPECT_FALSE(media_session_observer->IsPlaying(2));
EXPECT_FALSE(media_session_observer->IsPlaying(3));
- EXPECT_EQ(MediaSession::Type::Content, GetSessionType());
+ EXPECT_EQ(MediaSession::AudioFocusType::Content, GetSessionType());
SystemResume();
@@ -484,7 +527,7 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest, MediaSessionType) {
EXPECT_TRUE(media_session_observer->IsPlaying(2));
EXPECT_TRUE(media_session_observer->IsPlaying(3));
- EXPECT_EQ(MediaSession::Type::Content, GetSessionType());
+ EXPECT_EQ(MediaSession::AudioFocusType::Content, GetSessionType());
}
IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest, ControlsShowForContent) {
@@ -495,7 +538,8 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest, ControlsShowForContent) {
new MockMediaSessionObserver);
// Starting a player with a content type should show the media controls.
- StartNewPlayer(media_session_observer.get(), MediaSession::Type::Content);
+ StartNewPlayer(media_session_observer.get(),
+ media::MediaContentType::Content);
EXPECT_TRUE(IsControllable());
EXPECT_FALSE(IsSuspended());
@@ -509,7 +553,8 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest, ControlsNoShowForTransient) {
new MockMediaSessionObserver);
// Starting a player with a transient type should not show the media controls.
- StartNewPlayer(media_session_observer.get(), MediaSession::Type::Transient);
+ StartNewPlayer(media_session_observer.get(),
+ media::MediaContentType::Transient);
EXPECT_FALSE(IsControllable());
EXPECT_FALSE(IsSuspended());
@@ -525,7 +570,8 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest, ControlsHideWhenStopped) {
std::unique_ptr<MockMediaSessionObserver> media_session_observer(
new MockMediaSessionObserver);
- StartNewPlayer(media_session_observer.get(), MediaSession::Type::Content);
+ StartNewPlayer(media_session_observer.get(),
+ media::MediaContentType::Content);
RemovePlayers(media_session_observer.get());
@@ -540,10 +586,12 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest, ControlsShownAcceptTransient) {
std::unique_ptr<MockMediaSessionObserver> media_session_observer(
new MockMediaSessionObserver);
- StartNewPlayer(media_session_observer.get(), MediaSession::Type::Content);
+ StartNewPlayer(media_session_observer.get(),
+ media::MediaContentType::Content);
// Transient player join the session without affecting the controls.
- StartNewPlayer(media_session_observer.get(), MediaSession::Type::Transient);
+ StartNewPlayer(media_session_observer.get(),
+ media::MediaContentType::Transient);
EXPECT_TRUE(IsControllable());
EXPECT_FALSE(IsSuspended());
@@ -560,10 +608,12 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
std::unique_ptr<MockMediaSessionObserver> media_session_observer(
new MockMediaSessionObserver);
- StartNewPlayer(media_session_observer.get(), MediaSession::Type::Transient);
+ StartNewPlayer(media_session_observer.get(),
+ media::MediaContentType::Transient);
// The controls are shown when the content player is added.
- StartNewPlayer(media_session_observer.get(), MediaSession::Type::Content);
+ StartNewPlayer(media_session_observer.get(),
+ media::MediaContentType::Content);
EXPECT_TRUE(IsControllable());
EXPECT_FALSE(IsSuspended());
@@ -577,8 +627,10 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
std::unique_ptr<MockMediaSessionObserver> media_session_observer(
new MockMediaSessionObserver);
- StartNewPlayer(media_session_observer.get(), MediaSession::Type::Content);
- StartNewPlayer(media_session_observer.get(), MediaSession::Type::Transient);
+ StartNewPlayer(media_session_observer.get(),
+ media::MediaContentType::Content);
+ StartNewPlayer(media_session_observer.get(),
+ media::MediaContentType::Transient);
// Removing only content player doesn't hide the controls since the session
// is still active.
@@ -598,8 +650,10 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
std::unique_ptr<MockMediaSessionObserver> media_session_observer(
new MockMediaSessionObserver);
- StartNewPlayer(media_session_observer.get(), MediaSession::Type::Content);
- StartNewPlayer(media_session_observer.get(), MediaSession::Type::Content);
+ StartNewPlayer(media_session_observer.get(),
+ media::MediaContentType::Content);
+ StartNewPlayer(media_session_observer.get(),
+ media::MediaContentType::Content);
RemovePlayer(media_session_observer.get(), 0);
@@ -623,8 +677,10 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
std::unique_ptr<MockMediaSessionObserver> media_session_observer(
new MockMediaSessionObserver);
- StartNewPlayer(media_session_observer.get(), MediaSession::Type::Content);
- StartNewPlayer(media_session_observer.get(), MediaSession::Type::Content);
+ StartNewPlayer(media_session_observer.get(),
+ media::MediaContentType::Content);
+ StartNewPlayer(media_session_observer.get(),
+ media::MediaContentType::Content);
RemovePlayers(media_session_observer.get());
@@ -643,8 +699,10 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
std::unique_ptr<MockMediaSessionObserver> media_session_observer(
new MockMediaSessionObserver);
- StartNewPlayer(media_session_observer.get(), MediaSession::Type::Content);
- StartNewPlayer(media_session_observer.get(), MediaSession::Type::Content);
+ StartNewPlayer(media_session_observer.get(),
+ media::MediaContentType::Content);
+ StartNewPlayer(media_session_observer.get(),
+ media::MediaContentType::Content);
OnPlayerPaused(media_session_observer.get(), 0);
@@ -668,7 +726,8 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
std::unique_ptr<MockMediaSessionObserver> media_session_observer(
new MockMediaSessionObserver);
- StartNewPlayer(media_session_observer.get(), MediaSession::Type::Content);
+ StartNewPlayer(media_session_observer.get(),
+ media::MediaContentType::Content);
SystemSuspend(true);
@@ -688,7 +747,8 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest, ControlsUpdatedWhenResumed) {
std::unique_ptr<MockMediaSessionObserver> media_session_observer(
new MockMediaSessionObserver);
- StartNewPlayer(media_session_observer.get(), MediaSession::Type::Content);
+ StartNewPlayer(media_session_observer.get(),
+ media::MediaContentType::Content);
SystemSuspend(true);
SystemResume();
@@ -707,7 +767,8 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
std::unique_ptr<MockMediaSessionObserver> media_session_observer(
new MockMediaSessionObserver);
- StartNewPlayer(media_session_observer.get(), MediaSession::Type::Content);
+ StartNewPlayer(media_session_observer.get(),
+ media::MediaContentType::Content);
SystemSuspend(false);
@@ -728,7 +789,8 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
std::unique_ptr<MockMediaSessionObserver> media_session_observer(
new MockMediaSessionObserver);
- StartNewPlayer(media_session_observer.get(), MediaSession::Type::Content);
+ StartNewPlayer(media_session_observer.get(),
+ media::MediaContentType::Content);
media_session_->Stop(MediaSession::SuspendType::UI);
@@ -749,12 +811,14 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
std::unique_ptr<MockMediaSessionObserver> media_session_observer(
new MockMediaSessionObserver);
- StartNewPlayer(media_session_observer.get(), MediaSession::Type::Content);
+ StartNewPlayer(media_session_observer.get(),
+ media::MediaContentType::Content);
SystemSuspend(true);
// This should reset the session and change it to a transient, so
// hide the controls.
- StartNewPlayer(media_session_observer.get(), MediaSession::Type::Transient);
+ StartNewPlayer(media_session_observer.get(),
+ media::MediaContentType::Transient);
EXPECT_FALSE(IsControllable());
EXPECT_FALSE(IsSuspended());
@@ -773,11 +837,13 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
std::unique_ptr<MockMediaSessionObserver> media_session_observer(
new MockMediaSessionObserver);
- StartNewPlayer(media_session_observer.get(), MediaSession::Type::Content);
+ StartNewPlayer(media_session_observer.get(),
+ media::MediaContentType::Content);
SystemSuspend(true);
// This should reset the session and update the controls.
- StartNewPlayer(media_session_observer.get(), MediaSession::Type::Content);
+ StartNewPlayer(media_session_observer.get(),
+ media::MediaContentType::Content);
EXPECT_TRUE(IsControllable());
EXPECT_FALSE(IsSuspended());
@@ -796,11 +862,12 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
std::unique_ptr<MockMediaSessionObserver> media_session_observer(
new MockMediaSessionObserver);
- StartNewPlayer(media_session_observer.get(), MediaSession::Type::Content);
+ StartNewPlayer(media_session_observer.get(),
+ media::MediaContentType::Content);
SystemSuspend(true);
// This should resume the session and update the controls.
- AddPlayer(media_session_observer.get(), 0, MediaSession::Type::Content);
+ AddPlayer(media_session_observer.get(), 0, media::MediaContentType::Content);
EXPECT_TRUE(IsControllable());
EXPECT_FALSE(IsSuspended());
@@ -817,7 +884,8 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
std::unique_ptr<MockMediaSessionObserver> media_session_observer(
new MockMediaSessionObserver);
- StartNewPlayer(media_session_observer.get(), MediaSession::Type::Content);
+ StartNewPlayer(media_session_observer.get(),
+ media::MediaContentType::Content);
UISuspend();
EXPECT_TRUE(IsControllable());
@@ -837,7 +905,8 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
std::unique_ptr<MockMediaSessionObserver> media_session_observer(
new MockMediaSessionObserver);
- StartNewPlayer(media_session_observer.get(), MediaSession::Type::Content);
+ StartNewPlayer(media_session_observer.get(),
+ media::MediaContentType::Content);
UISuspend();
UIResume();
@@ -849,7 +918,8 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
DontResumeBySystemUISuspendedSessions) {
std::unique_ptr<MockMediaSessionObserver> media_session_observer(
new MockMediaSessionObserver);
- StartNewPlayer(media_session_observer.get(), MediaSession::Type::Content);
+ StartNewPlayer(media_session_observer.get(),
+ media::MediaContentType::Content);
UISuspend();
EXPECT_TRUE(IsControllable());
@@ -864,7 +934,8 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
AllowUIResumeForSystemSuspend) {
std::unique_ptr<MockMediaSessionObserver> media_session_observer(
new MockMediaSessionObserver);
- StartNewPlayer(media_session_observer.get(), MediaSession::Type::Content);
+ StartNewPlayer(media_session_observer.get(),
+ media::MediaContentType::Content);
SystemSuspend(true);
EXPECT_TRUE(IsControllable());
@@ -878,7 +949,8 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest, ResumeSuspendFromUI) {
std::unique_ptr<MockMediaSessionObserver> media_session_observer(
new MockMediaSessionObserver);
- StartNewPlayer(media_session_observer.get(), MediaSession::Type::Content);
+ StartNewPlayer(media_session_observer.get(),
+ media::MediaContentType::Content);
UISuspend();
EXPECT_TRUE(IsControllable());
@@ -892,7 +964,8 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest, ResumeSuspendFromUI) {
IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest, ResumeSuspendFromSystem) {
std::unique_ptr<MockMediaSessionObserver> media_session_observer(
new MockMediaSessionObserver);
- StartNewPlayer(media_session_observer.get(), MediaSession::Type::Content);
+ StartNewPlayer(media_session_observer.get(),
+ media::MediaContentType::Content);
SystemSuspend(true);
EXPECT_TRUE(IsControllable());
@@ -908,7 +981,8 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest, UMA_Suspended_SystemTransient) {
new MockMediaSessionObserver);
base::HistogramTester tester;
- StartNewPlayer(media_session_observer.get(), MediaSession::Type::Content);
+ StartNewPlayer(media_session_observer.get(),
+ media::MediaContentType::Content);
SystemSuspend(true);
std::unique_ptr<base::HistogramSamples> samples(
@@ -926,7 +1000,8 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
new MockMediaSessionObserver);
base::HistogramTester tester;
- StartNewPlayer(media_session_observer.get(), MediaSession::Type::Content);
+ StartNewPlayer(media_session_observer.get(),
+ media::MediaContentType::Content);
SystemSuspend(false);
std::unique_ptr<base::HistogramSamples> samples(
@@ -942,7 +1017,8 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest, UMA_Suspended_UI) {
new MockMediaSessionObserver);
base::HistogramTester tester;
- StartNewPlayer(media_session_observer.get(), MediaSession::Type::Content);
+ StartNewPlayer(media_session_observer.get(),
+ media::MediaContentType::Content);
UISuspend();
std::unique_ptr<base::HistogramSamples> samples(
@@ -958,7 +1034,8 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest, UMA_Suspended_Multiple) {
new MockMediaSessionObserver);
base::HistogramTester tester;
- StartNewPlayer(media_session_observer.get(), MediaSession::Type::Content);
+ StartNewPlayer(media_session_observer.get(),
+ media::MediaContentType::Content);
UISuspend();
UIResume();
@@ -984,7 +1061,8 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest, UMA_Suspended_Crossing) {
new MockMediaSessionObserver);
base::HistogramTester tester;
- StartNewPlayer(media_session_observer.get(), MediaSession::Type::Content);
+ StartNewPlayer(media_session_observer.get(),
+ media::MediaContentType::Content);
UISuspend();
SystemSuspend(true);
@@ -1009,7 +1087,8 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest, UMA_Suspended_Stop) {
new MockMediaSessionObserver);
base::HistogramTester tester;
- StartNewPlayer(media_session_observer.get(), MediaSession::Type::Content);
+ StartNewPlayer(media_session_observer.get(),
+ media::MediaContentType::Content);
media_session_->Stop(MediaSession::SuspendType::UI);
std::unique_ptr<base::HistogramSamples> samples(
@@ -1044,7 +1123,8 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
media_session_uma_helper->SetClockForTest(
std::unique_ptr<base::SimpleTestTickClock>(clock));
- StartNewPlayer(media_session_observer.get(), MediaSession::Type::Content);
+ StartNewPlayer(media_session_observer.get(),
+ media::MediaContentType::Content);
clock->Advance(base::TimeDelta::FromMilliseconds(1000));
media_session_->Stop(MediaSession::SuspendType::UI);
@@ -1067,7 +1147,8 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
media_session_uma_helper->SetClockForTest(
std::unique_ptr<base::SimpleTestTickClock>(clock));
- StartNewPlayer(media_session_observer.get(), MediaSession::Type::Content);
+ StartNewPlayer(media_session_observer.get(),
+ media::MediaContentType::Content);
clock->Advance(base::TimeDelta::FromMilliseconds(1000));
UISuspend();
@@ -1096,7 +1177,8 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
media_session_uma_helper->SetClockForTest(
std::unique_ptr<base::SimpleTestTickClock>(clock));
- StartNewPlayer(media_session_observer.get(), MediaSession::Type::Content);
+ StartNewPlayer(media_session_observer.get(),
+ media::MediaContentType::Content);
clock->Advance(base::TimeDelta::FromMilliseconds(1000));
SystemSuspend(true);
@@ -1125,7 +1207,8 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
media_session_uma_helper->SetClockForTest(
std::unique_ptr<base::SimpleTestTickClock>(clock));
- StartNewPlayer(media_session_observer.get(), MediaSession::Type::Content);
+ StartNewPlayer(media_session_observer.get(),
+ media::MediaContentType::Content);
clock->Advance(base::TimeDelta::FromMilliseconds(500));
SystemSuspend(true);
@@ -1158,12 +1241,14 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
media_session_uma_helper->SetClockForTest(
std::unique_ptr<base::SimpleTestTickClock>(clock));
- StartNewPlayer(media_session_observer.get(), MediaSession::Type::Content);
+ StartNewPlayer(media_session_observer.get(),
+ media::MediaContentType::Content);
clock->Advance(base::TimeDelta::FromMilliseconds(500));
SystemSuspend(true);
media_session_->Stop(MediaSession::SuspendType::UI);
- StartNewPlayer(media_session_observer.get(), MediaSession::Type::Content);
+ StartNewPlayer(media_session_observer.get(),
+ media::MediaContentType::Content);
clock->Advance(base::TimeDelta::FromMilliseconds(5000));
SystemResume();
media_session_->Stop(MediaSession::SuspendType::UI);
@@ -1187,11 +1272,13 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
media_session_uma_helper->SetClockForTest(
std::unique_ptr<base::SimpleTestTickClock>(clock));
- StartNewPlayer(media_session_observer.get(), MediaSession::Type::Content);
+ StartNewPlayer(media_session_observer.get(),
+ media::MediaContentType::Content);
clock->Advance(base::TimeDelta::FromMilliseconds(10000));
RemovePlayer(media_session_observer.get(), 0);
- StartNewPlayer(media_session_observer.get(), MediaSession::Type::Content);
+ StartNewPlayer(media_session_observer.get(),
+ media::MediaContentType::Content);
clock->Advance(base::TimeDelta::FromMilliseconds(1000));
media_session_->Stop(MediaSession::SuspendType::UI);
« content/browser/media/session/media_session.h ('K') | « content/browser/media/session/media_session.cc ('k') | content/browser/media/session/media_session_controller.h » ('j') | content/renderer/media/webmediaplayer_ms.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698