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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2453623003: Decouple MediaSession messages from WebContents (full patch) (Closed)
Patch Set: nit Created 4 years, 1 month 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') | content/browser/media/session/media_session_impl_visibility_browsertest.cc » ('j') | 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_browsertest.cc b/content/browser/media/session/media_session_impl_browsertest.cc
similarity index 59%
rename from content/browser/media/session/media_session_browsertest.cc
rename to content/browser/media/session/media_session_impl_browsertest.cc
index 5f79eeb2862e0ff58f59de8340865ac4200b620a..755bfac19cb2df12615a5523067e96346a2b8495 100644
--- a/content/browser/media/session/media_session_browsertest.cc
+++ b/content/browser/media/session/media_session_impl_browsertest.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "content/browser/media/session/media_session.h"
+#include "content/browser/media/session/media_session_impl.h"
#include <stddef.h>
@@ -15,16 +15,18 @@
#include "base/test/simple_test_tick_clock.h"
#include "content/browser/media/session/audio_focus_delegate.h"
#include "content/browser/media/session/mock_media_session_player_observer.h"
+#include "content/public/browser/media_session.h"
+#include "content/public/browser/media_session_observer.h"
#include "content/public/browser/web_contents.h"
-#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;
-using content::WebContentsObserver;
using content::MediaSession;
+using content::MediaSessionImpl;
+using content::MediaSessionObserver;
using content::AudioFocusDelegate;
using content::MediaSessionPlayerObserver;
using content::MediaSessionUmaHelper;
@@ -43,38 +45,38 @@ class MockAudioFocusDelegate : public AudioFocusDelegate {
return true;
}
- void AbandonAudioFocus() override {
- }
+ void AbandonAudioFocus() override {}
};
-class MockWebContentsObserver : public WebContentsObserver {
+class MockMediaSessionObserver : public MediaSessionObserver {
public:
- MockWebContentsObserver(WebContents* web_contents)
- : WebContentsObserver(web_contents) {}
+ MockMediaSessionObserver(MediaSession* media_session)
+ : MediaSessionObserver(media_session) {}
MOCK_METHOD2(MediaSessionStateChanged,
void(bool is_controllable, bool is_suspended));
+ MOCK_METHOD0(MediaSessionDestroyed, void());
};
} // namespace
-class MediaSessionBrowserTest : public content::ContentBrowserTest {
+class MediaSessionImplBrowserTest : public content::ContentBrowserTest {
protected:
- MediaSessionBrowserTest() = default;
+ MediaSessionImplBrowserTest() = default;
void SetUpOnMainThread() override {
ContentBrowserTest::SetUpOnMainThread();
- mock_web_contents_observer_.reset(
- new MockWebContentsObserver(shell()->web_contents()));
- media_session_ = MediaSession::Get(shell()->web_contents());
+ media_session_ = MediaSessionImpl::Get(shell()->web_contents());
+ mock_media_session_observer_.reset(
+ new MockMediaSessionObserver(media_session_));
media_session_->SetDelegateForTests(
std::unique_ptr<AudioFocusDelegate>(new MockAudioFocusDelegate()));
ASSERT_TRUE(media_session_);
}
void TearDownOnMainThread() override {
- mock_web_contents_observer_.reset();
+ mock_media_session_observer_.reset();
media_session_->RemoveAllPlayersForTest();
media_session_ = nullptr;
@@ -82,11 +84,9 @@ class MediaSessionBrowserTest : public content::ContentBrowserTest {
ContentBrowserTest::TearDownOnMainThread();
}
- void StartNewPlayer(
- MockMediaSessionPlayerObserver* player_observer,
- media::MediaContentType media_content_type) {
- bool result = AddPlayer(player_observer,
- player_observer->StartNewPlayer(),
+ void StartNewPlayer(MockMediaSessionPlayerObserver* player_observer,
+ media::MediaContentType media_content_type) {
+ bool result = AddPlayer(player_observer, player_observer->StartNewPlayer(),
media_content_type);
EXPECT_TRUE(result);
}
@@ -94,24 +94,20 @@ class MediaSessionBrowserTest : public content::ContentBrowserTest {
bool AddPlayer(MockMediaSessionPlayerObserver* player_observer,
int player_id,
media::MediaContentType type) {
- return media_session_->AddPlayer(player_observer, player_id,
- type);
+ return media_session_->AddPlayer(player_observer, player_id, type);
}
- void RemovePlayer(
- MockMediaSessionPlayerObserver* player_observer,
- int player_id) {
+ void RemovePlayer(MockMediaSessionPlayerObserver* player_observer,
+ int player_id) {
media_session_->RemovePlayer(player_observer, player_id);
}
- void RemovePlayers(
- MockMediaSessionPlayerObserver* player_observer) {
+ void RemovePlayers(MockMediaSessionPlayerObserver* player_observer) {
media_session_->RemovePlayers(player_observer);
}
- void OnPlayerPaused(
- MockMediaSessionPlayerObserver* player_observer,
- int player_id) {
+ void OnPlayerPaused(MockMediaSessionPlayerObserver* player_observer,
+ int player_id) {
media_session_->OnPlayerPaused(player_observer, player_id);
}
@@ -125,39 +121,31 @@ class MediaSessionBrowserTest : public content::ContentBrowserTest {
bool IsSuspended() { return media_session_->IsSuspended(); }
- void UIResume() {
- media_session_->Resume(MediaSession::SuspendType::UI);
- }
+ void UIResume() { media_session_->Resume(MediaSession::SuspendType::UI); }
void SystemResume() {
media_session_->OnResumeInternal(MediaSession::SuspendType::SYSTEM);
}
- void UISuspend() {
- media_session_->Suspend(MediaSession::SuspendType::UI);
- }
+ void UISuspend() { media_session_->Suspend(MediaSession::SuspendType::UI); }
void SystemSuspend(bool temporary) {
- media_session_->OnSuspendInternal(
- MediaSession::SuspendType::SYSTEM,
- temporary ? MediaSession::State::SUSPENDED
- : MediaSession::State::INACTIVE);
+ media_session_->OnSuspendInternal(MediaSession::SuspendType::SYSTEM,
+ temporary
+ ? MediaSessionImpl::State::SUSPENDED
+ : MediaSessionImpl::State::INACTIVE);
}
- void SystemStartDucking() {
- media_session_->StartDucking();
- }
+ void SystemStartDucking() { media_session_->StartDucking(); }
- void SystemStopDucking() {
- media_session_->StopDucking();
- }
+ void SystemStopDucking() { media_session_->StopDucking(); }
- MockWebContentsObserver* mock_web_contents_observer() {
- return mock_web_contents_observer_.get();
+ MockMediaSessionObserver* mock_media_session_observer() {
+ return mock_media_session_observer_.get();
}
- std::unique_ptr<MediaSession> CreateDummyMediaSession() {
- return std::unique_ptr<MediaSession>(new MediaSession(nullptr));
+ std::unique_ptr<MediaSessionImpl> CreateDummyMediaSession() {
+ return std::unique_ptr<MediaSessionImpl>(new MediaSessionImpl(nullptr));
}
MediaSessionUmaHelper* GetMediaSessionUMAHelper() {
@@ -165,61 +153,52 @@ class MediaSessionBrowserTest : public content::ContentBrowserTest {
}
protected:
- MediaSession* media_session_;
- std::unique_ptr<MockWebContentsObserver> mock_web_contents_observer_;
+ MediaSessionImpl* media_session_;
+ std::unique_ptr<MockMediaSessionObserver> mock_media_session_observer_;
- DISALLOW_COPY_AND_ASSIGN(MediaSessionBrowserTest);
+ DISALLOW_COPY_AND_ASSIGN(MediaSessionImplBrowserTest);
};
-IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
+IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest,
PlayersFromSameObserverDoNotStopEachOtherInSameSession) {
std::unique_ptr<MockMediaSessionPlayerObserver> player_observer(
new MockMediaSessionPlayerObserver);
- StartNewPlayer(player_observer.get(),
- media::MediaContentType::Persistent);
- StartNewPlayer(player_observer.get(),
- media::MediaContentType::Persistent);
- StartNewPlayer(player_observer.get(),
- media::MediaContentType::Persistent);
+ StartNewPlayer(player_observer.get(), media::MediaContentType::Persistent);
+ StartNewPlayer(player_observer.get(), media::MediaContentType::Persistent);
+ StartNewPlayer(player_observer.get(), media::MediaContentType::Persistent);
EXPECT_TRUE(player_observer->IsPlaying(0));
EXPECT_TRUE(player_observer->IsPlaying(1));
EXPECT_TRUE(player_observer->IsPlaying(2));
}
-IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
+IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest,
PlayersFromManyObserverDoNotStopEachOtherInSameSession) {
- std::unique_ptr<MockMediaSessionPlayerObserver>
- player_observer_1(new MockMediaSessionPlayerObserver);
- std::unique_ptr<MockMediaSessionPlayerObserver>
- player_observer_2(new MockMediaSessionPlayerObserver);
- std::unique_ptr<MockMediaSessionPlayerObserver>
- player_observer_3(new MockMediaSessionPlayerObserver);
-
- StartNewPlayer(player_observer_1.get(),
- media::MediaContentType::Persistent);
- StartNewPlayer(player_observer_2.get(),
- media::MediaContentType::Persistent);
- StartNewPlayer(player_observer_3.get(),
- media::MediaContentType::Persistent);
+ std::unique_ptr<MockMediaSessionPlayerObserver> player_observer_1(
+ new MockMediaSessionPlayerObserver);
+ std::unique_ptr<MockMediaSessionPlayerObserver> player_observer_2(
+ new MockMediaSessionPlayerObserver);
+ std::unique_ptr<MockMediaSessionPlayerObserver> player_observer_3(
+ new MockMediaSessionPlayerObserver);
+
+ StartNewPlayer(player_observer_1.get(), media::MediaContentType::Persistent);
+ StartNewPlayer(player_observer_2.get(), media::MediaContentType::Persistent);
+ StartNewPlayer(player_observer_3.get(), media::MediaContentType::Persistent);
EXPECT_TRUE(player_observer_1->IsPlaying(0));
EXPECT_TRUE(player_observer_2->IsPlaying(0));
EXPECT_TRUE(player_observer_3->IsPlaying(0));
}
-IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
+IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest,
SuspendedMediaSessionStopsPlayers) {
std::unique_ptr<MockMediaSessionPlayerObserver> player_observer(
new MockMediaSessionPlayerObserver);
- StartNewPlayer(player_observer.get(),
- media::MediaContentType::Persistent);
- StartNewPlayer(player_observer.get(),
- media::MediaContentType::Persistent);
- StartNewPlayer(player_observer.get(),
- media::MediaContentType::Persistent);
+ StartNewPlayer(player_observer.get(), media::MediaContentType::Persistent);
+ StartNewPlayer(player_observer.get(), media::MediaContentType::Persistent);
+ StartNewPlayer(player_observer.get(), media::MediaContentType::Persistent);
SystemSuspend(true);
@@ -228,17 +207,14 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
EXPECT_FALSE(player_observer->IsPlaying(2));
}
-IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
+IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest,
ResumedMediaSessionRestartsPlayers) {
std::unique_ptr<MockMediaSessionPlayerObserver> player_observer(
new MockMediaSessionPlayerObserver);
- StartNewPlayer(player_observer.get(),
- media::MediaContentType::Persistent);
- StartNewPlayer(player_observer.get(),
- media::MediaContentType::Persistent);
- StartNewPlayer(player_observer.get(),
- media::MediaContentType::Persistent);
+ StartNewPlayer(player_observer.get(), media::MediaContentType::Persistent);
+ StartNewPlayer(player_observer.get(), media::MediaContentType::Persistent);
+ StartNewPlayer(player_observer.get(), media::MediaContentType::Persistent);
SystemSuspend(true);
SystemResume();
@@ -248,13 +224,12 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
EXPECT_TRUE(player_observer->IsPlaying(2));
}
-IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
+IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest,
StartedPlayerOnSuspendedSessionPlaysAlone) {
std::unique_ptr<MockMediaSessionPlayerObserver> player_observer(
new MockMediaSessionPlayerObserver);
- StartNewPlayer(player_observer.get(),
- media::MediaContentType::Persistent);
+ StartNewPlayer(player_observer.get(), media::MediaContentType::Persistent);
EXPECT_TRUE(player_observer->IsPlaying(0));
@@ -262,127 +237,105 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
EXPECT_FALSE(player_observer->IsPlaying(0));
- StartNewPlayer(player_observer.get(),
- media::MediaContentType::Persistent);
+ StartNewPlayer(player_observer.get(), media::MediaContentType::Persistent);
EXPECT_FALSE(player_observer->IsPlaying(0));
EXPECT_TRUE(player_observer->IsPlaying(1));
- StartNewPlayer(player_observer.get(),
- media::MediaContentType::Persistent);
+ StartNewPlayer(player_observer.get(), media::MediaContentType::Persistent);
EXPECT_FALSE(player_observer->IsPlaying(0));
EXPECT_TRUE(player_observer->IsPlaying(1));
EXPECT_TRUE(player_observer->IsPlaying(2));
}
-IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
- InitialVolumeMultiplier) {
+IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest, InitialVolumeMultiplier) {
std::unique_ptr<MockMediaSessionPlayerObserver> player_observer(
new MockMediaSessionPlayerObserver);
- StartNewPlayer(player_observer.get(),
- media::MediaContentType::Persistent);
- StartNewPlayer(player_observer.get(),
- media::MediaContentType::Persistent);
+ StartNewPlayer(player_observer.get(), media::MediaContentType::Persistent);
+ StartNewPlayer(player_observer.get(), media::MediaContentType::Persistent);
- EXPECT_EQ(kDefaultVolumeMultiplier,
- player_observer->GetVolumeMultiplier(0));
- EXPECT_EQ(kDefaultVolumeMultiplier,
- player_observer->GetVolumeMultiplier(1));
+ EXPECT_EQ(kDefaultVolumeMultiplier, player_observer->GetVolumeMultiplier(0));
+ EXPECT_EQ(kDefaultVolumeMultiplier, player_observer->GetVolumeMultiplier(1));
}
-IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
+IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest,
StartDuckingReducesVolumeMultiplier) {
std::unique_ptr<MockMediaSessionPlayerObserver> player_observer(
new MockMediaSessionPlayerObserver);
- StartNewPlayer(player_observer.get(),
- media::MediaContentType::Persistent);
- StartNewPlayer(player_observer.get(),
- media::MediaContentType::Persistent);
+ StartNewPlayer(player_observer.get(), media::MediaContentType::Persistent);
+ StartNewPlayer(player_observer.get(), media::MediaContentType::Persistent);
SystemStartDucking();
- EXPECT_EQ(kDuckingVolumeMultiplier,
- player_observer->GetVolumeMultiplier(0));
- EXPECT_EQ(kDuckingVolumeMultiplier,
- player_observer->GetVolumeMultiplier(1));
+ EXPECT_EQ(kDuckingVolumeMultiplier, player_observer->GetVolumeMultiplier(0));
+ EXPECT_EQ(kDuckingVolumeMultiplier, player_observer->GetVolumeMultiplier(1));
- StartNewPlayer(player_observer.get(),
- media::MediaContentType::Persistent);
+ StartNewPlayer(player_observer.get(), media::MediaContentType::Persistent);
- EXPECT_EQ(kDuckingVolumeMultiplier,
- player_observer->GetVolumeMultiplier(2));
+ EXPECT_EQ(kDuckingVolumeMultiplier, player_observer->GetVolumeMultiplier(2));
}
-IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
+IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest,
StopDuckingRecoversVolumeMultiplier) {
std::unique_ptr<MockMediaSessionPlayerObserver> player_observer(
new MockMediaSessionPlayerObserver);
- StartNewPlayer(player_observer.get(),
- media::MediaContentType::Persistent);
- StartNewPlayer(player_observer.get(),
- media::MediaContentType::Persistent);
+ StartNewPlayer(player_observer.get(), media::MediaContentType::Persistent);
+ StartNewPlayer(player_observer.get(), media::MediaContentType::Persistent);
SystemStartDucking();
SystemStopDucking();
- EXPECT_EQ(kDefaultVolumeMultiplier,
- player_observer->GetVolumeMultiplier(0));
- EXPECT_EQ(kDefaultVolumeMultiplier,
- player_observer->GetVolumeMultiplier(1));
+ EXPECT_EQ(kDefaultVolumeMultiplier, player_observer->GetVolumeMultiplier(0));
+ EXPECT_EQ(kDefaultVolumeMultiplier, player_observer->GetVolumeMultiplier(1));
- StartNewPlayer(player_observer.get(),
- media::MediaContentType::Persistent);
+ StartNewPlayer(player_observer.get(), media::MediaContentType::Persistent);
- EXPECT_EQ(kDefaultVolumeMultiplier,
- player_observer->GetVolumeMultiplier(2));
+ EXPECT_EQ(kDefaultVolumeMultiplier, player_observer->GetVolumeMultiplier(2));
}
-IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest, AudioFocusInitialState) {
+IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest, AudioFocusInitialState) {
EXPECT_FALSE(HasAudioFocus());
}
-IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest, StartPlayerGivesFocus) {
+IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest, StartPlayerGivesFocus) {
std::unique_ptr<MockMediaSessionPlayerObserver> player_observer(
new MockMediaSessionPlayerObserver);
- StartNewPlayer(player_observer.get(),
- media::MediaContentType::Persistent);
+ StartNewPlayer(player_observer.get(), media::MediaContentType::Persistent);
EXPECT_TRUE(HasAudioFocus());
}
-IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest, SuspendGivesAwayAudioFocus) {
+IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest,
+ SuspendGivesAwayAudioFocus) {
std::unique_ptr<MockMediaSessionPlayerObserver> player_observer(
new MockMediaSessionPlayerObserver);
- StartNewPlayer(player_observer.get(),
- media::MediaContentType::Persistent);
+ StartNewPlayer(player_observer.get(), media::MediaContentType::Persistent);
SystemSuspend(true);
EXPECT_FALSE(HasAudioFocus());
}
-IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest, StopGivesAwayAudioFocus) {
+IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest, StopGivesAwayAudioFocus) {
std::unique_ptr<MockMediaSessionPlayerObserver> player_observer(
new MockMediaSessionPlayerObserver);
- StartNewPlayer(player_observer.get(),
- media::MediaContentType::Persistent);
+ StartNewPlayer(player_observer.get(), media::MediaContentType::Persistent);
media_session_->Stop(MediaSession::SuspendType::UI);
EXPECT_FALSE(HasAudioFocus());
}
-IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest, ResumeGivesBackAudioFocus) {
+IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest, ResumeGivesBackAudioFocus) {
std::unique_ptr<MockMediaSessionPlayerObserver> player_observer(
new MockMediaSessionPlayerObserver);
- StartNewPlayer(player_observer.get(),
- media::MediaContentType::Persistent);
+ StartNewPlayer(player_observer.get(), media::MediaContentType::Persistent);
SystemSuspend(true);
SystemResume();
@@ -390,17 +343,14 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest, ResumeGivesBackAudioFocus) {
EXPECT_TRUE(HasAudioFocus());
}
-IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
+IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest,
RemovingLastPlayerDropsAudioFocus) {
std::unique_ptr<MockMediaSessionPlayerObserver> player_observer(
new MockMediaSessionPlayerObserver);
- StartNewPlayer(player_observer.get(),
- media::MediaContentType::Persistent);
- StartNewPlayer(player_observer.get(),
- media::MediaContentType::Persistent);
- StartNewPlayer(player_observer.get(),
- media::MediaContentType::Persistent);
+ StartNewPlayer(player_observer.get(), media::MediaContentType::Persistent);
+ StartNewPlayer(player_observer.get(), media::MediaContentType::Persistent);
+ StartNewPlayer(player_observer.get(), media::MediaContentType::Persistent);
RemovePlayer(player_observer.get(), 0);
EXPECT_TRUE(HasAudioFocus());
@@ -410,21 +360,18 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
EXPECT_FALSE(HasAudioFocus());
}
-IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
+IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest,
RemovingLastPlayerFromManyObserversDropsAudioFocus) {
- std::unique_ptr<MockMediaSessionPlayerObserver>
- player_observer_1(new MockMediaSessionPlayerObserver);
- std::unique_ptr<MockMediaSessionPlayerObserver>
- player_observer_2(new MockMediaSessionPlayerObserver);
- std::unique_ptr<MockMediaSessionPlayerObserver>
- player_observer_3(new MockMediaSessionPlayerObserver);
-
- StartNewPlayer(player_observer_1.get(),
- media::MediaContentType::Persistent);
- StartNewPlayer(player_observer_2.get(),
- media::MediaContentType::Persistent);
- StartNewPlayer(player_observer_3.get(),
- media::MediaContentType::Persistent);
+ std::unique_ptr<MockMediaSessionPlayerObserver> player_observer_1(
+ new MockMediaSessionPlayerObserver);
+ std::unique_ptr<MockMediaSessionPlayerObserver> player_observer_2(
+ new MockMediaSessionPlayerObserver);
+ std::unique_ptr<MockMediaSessionPlayerObserver> player_observer_3(
+ new MockMediaSessionPlayerObserver);
+
+ StartNewPlayer(player_observer_1.get(), media::MediaContentType::Persistent);
+ StartNewPlayer(player_observer_2.get(), media::MediaContentType::Persistent);
+ StartNewPlayer(player_observer_3.get(), media::MediaContentType::Persistent);
RemovePlayer(player_observer_1.get(), 0);
EXPECT_TRUE(HasAudioFocus());
@@ -434,21 +381,17 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
EXPECT_FALSE(HasAudioFocus());
}
-IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
+IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest,
RemovingAllPlayersFromObserversDropsAudioFocus) {
- std::unique_ptr<MockMediaSessionPlayerObserver>
- player_observer_1(new MockMediaSessionPlayerObserver);
- std::unique_ptr<MockMediaSessionPlayerObserver>
- player_observer_2(new MockMediaSessionPlayerObserver);
-
- StartNewPlayer(player_observer_1.get(),
- media::MediaContentType::Persistent);
- StartNewPlayer(player_observer_1.get(),
- media::MediaContentType::Persistent);
- StartNewPlayer(player_observer_2.get(),
- media::MediaContentType::Persistent);
- StartNewPlayer(player_observer_2.get(),
- media::MediaContentType::Persistent);
+ std::unique_ptr<MockMediaSessionPlayerObserver> player_observer_1(
+ new MockMediaSessionPlayerObserver);
+ std::unique_ptr<MockMediaSessionPlayerObserver> player_observer_2(
+ new MockMediaSessionPlayerObserver);
+
+ StartNewPlayer(player_observer_1.get(), media::MediaContentType::Persistent);
+ StartNewPlayer(player_observer_1.get(), media::MediaContentType::Persistent);
+ StartNewPlayer(player_observer_2.get(), media::MediaContentType::Persistent);
+ StartNewPlayer(player_observer_2.get(), media::MediaContentType::Persistent);
RemovePlayers(player_observer_1.get());
EXPECT_TRUE(HasAudioFocus());
@@ -456,32 +399,28 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
EXPECT_FALSE(HasAudioFocus());
}
-IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest, ResumePlayGivesAudioFocus) {
+IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest, ResumePlayGivesAudioFocus) {
std::unique_ptr<MockMediaSessionPlayerObserver> player_observer(
new MockMediaSessionPlayerObserver);
- StartNewPlayer(player_observer.get(),
- media::MediaContentType::Persistent);
+ StartNewPlayer(player_observer.get(), media::MediaContentType::Persistent);
RemovePlayer(player_observer.get(), 0);
EXPECT_FALSE(HasAudioFocus());
- EXPECT_TRUE(AddPlayer(player_observer.get(), 0,
- media::MediaContentType::Persistent));
+ EXPECT_TRUE(
+ AddPlayer(player_observer.get(), 0, media::MediaContentType::Persistent));
EXPECT_TRUE(HasAudioFocus());
}
-IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
+IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest,
ResumeSuspendAreSentOnlyOncePerPlayers) {
std::unique_ptr<MockMediaSessionPlayerObserver> player_observer(
new MockMediaSessionPlayerObserver);
- StartNewPlayer(player_observer.get(),
- media::MediaContentType::Persistent);
- StartNewPlayer(player_observer.get(),
- media::MediaContentType::Persistent);
- StartNewPlayer(player_observer.get(),
- media::MediaContentType::Persistent);
+ StartNewPlayer(player_observer.get(), media::MediaContentType::Persistent);
+ StartNewPlayer(player_observer.get(), media::MediaContentType::Persistent);
+ StartNewPlayer(player_observer.get(), media::MediaContentType::Persistent);
EXPECT_EQ(0, player_observer->received_suspend_calls());
EXPECT_EQ(0, player_observer->received_resume_calls());
@@ -493,25 +432,22 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
EXPECT_EQ(3, player_observer->received_resume_calls());
}
-IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
+IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest,
ResumeSuspendAreSentOnlyOncePerPlayersAddedTwice) {
std::unique_ptr<MockMediaSessionPlayerObserver> player_observer(
new MockMediaSessionPlayerObserver);
- StartNewPlayer(player_observer.get(),
- media::MediaContentType::Persistent);
- StartNewPlayer(player_observer.get(),
- media::MediaContentType::Persistent);
- StartNewPlayer(player_observer.get(),
- media::MediaContentType::Persistent);
+ StartNewPlayer(player_observer.get(), media::MediaContentType::Persistent);
+ StartNewPlayer(player_observer.get(), media::MediaContentType::Persistent);
+ StartNewPlayer(player_observer.get(), media::MediaContentType::Persistent);
// Adding the three players above again.
- EXPECT_TRUE(AddPlayer(player_observer.get(), 0,
- media::MediaContentType::Persistent));
- EXPECT_TRUE(AddPlayer(player_observer.get(), 1,
- media::MediaContentType::Persistent));
- EXPECT_TRUE(AddPlayer(player_observer.get(), 2,
- media::MediaContentType::Persistent));
+ EXPECT_TRUE(
+ AddPlayer(player_observer.get(), 0, media::MediaContentType::Persistent));
+ EXPECT_TRUE(
+ AddPlayer(player_observer.get(), 1, media::MediaContentType::Persistent));
+ EXPECT_TRUE(
+ AddPlayer(player_observer.get(), 2, media::MediaContentType::Persistent));
EXPECT_EQ(0, player_observer->received_suspend_calls());
EXPECT_EQ(0, player_observer->received_resume_calls());
@@ -523,43 +459,38 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
EXPECT_EQ(3, player_observer->received_resume_calls());
}
-IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
+IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest,
RemovingTheSamePlayerTwiceIsANoop) {
std::unique_ptr<MockMediaSessionPlayerObserver> player_observer(
new MockMediaSessionPlayerObserver);
- StartNewPlayer(player_observer.get(),
- media::MediaContentType::Persistent);
+ StartNewPlayer(player_observer.get(), media::MediaContentType::Persistent);
RemovePlayer(player_observer.get(), 0);
RemovePlayer(player_observer.get(), 0);
}
-IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest, AudioFocusType) {
+IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest, AudioFocusType) {
std::unique_ptr<MockMediaSessionPlayerObserver> player_observer(
new MockMediaSessionPlayerObserver);
// Starting a player with a given type should set the session to that type.
- StartNewPlayer(player_observer.get(),
- media::MediaContentType::Transient);
+ StartNewPlayer(player_observer.get(), media::MediaContentType::Transient);
EXPECT_EQ(content::AudioFocusManager::AudioFocusType::GainTransientMayDuck,
GetSessionAudioFocusType());
// Adding a player of the same type should have no effect on the type.
- StartNewPlayer(player_observer.get(),
- media::MediaContentType::Transient);
+ StartNewPlayer(player_observer.get(), media::MediaContentType::Transient);
EXPECT_EQ(content::AudioFocusManager::AudioFocusType::GainTransientMayDuck,
GetSessionAudioFocusType());
// Adding a player of Content type should override the current type.
- StartNewPlayer(player_observer.get(),
- media::MediaContentType::Persistent);
+ StartNewPlayer(player_observer.get(), media::MediaContentType::Persistent);
EXPECT_EQ(content::AudioFocusManager::AudioFocusType::Gain,
GetSessionAudioFocusType());
// Adding a player of the Transient type should have no effect on the type.
- StartNewPlayer(player_observer.get(),
- media::MediaContentType::Transient);
+ StartNewPlayer(player_observer.get(), media::MediaContentType::Transient);
EXPECT_EQ(content::AudioFocusManager::AudioFocusType::Gain,
GetSessionAudioFocusType());
@@ -589,48 +520,46 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest, AudioFocusType) {
GetSessionAudioFocusType());
}
-IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest, ControlsShowForContent) {
- EXPECT_CALL(*mock_web_contents_observer(),
+IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest, ControlsShowForContent) {
+ EXPECT_CALL(*mock_media_session_observer(),
MediaSessionStateChanged(true, false));
std::unique_ptr<MockMediaSessionPlayerObserver> player_observer(
new MockMediaSessionPlayerObserver);
// Starting a player with a content type should show the media controls.
- StartNewPlayer(player_observer.get(),
- media::MediaContentType::Persistent);
+ StartNewPlayer(player_observer.get(), media::MediaContentType::Persistent);
EXPECT_TRUE(IsControllable());
EXPECT_FALSE(IsSuspended());
}
-IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest, ControlsNoShowForTransient) {
- EXPECT_CALL(*mock_web_contents_observer(),
+IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest,
+ ControlsNoShowForTransient) {
+ EXPECT_CALL(*mock_media_session_observer(),
MediaSessionStateChanged(false, false));
std::unique_ptr<MockMediaSessionPlayerObserver> player_observer(
new MockMediaSessionPlayerObserver);
// Starting a player with a transient type should not show the media controls.
- StartNewPlayer(player_observer.get(),
- media::MediaContentType::Transient);
+ StartNewPlayer(player_observer.get(), media::MediaContentType::Transient);
EXPECT_FALSE(IsControllable());
EXPECT_FALSE(IsSuspended());
}
-IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest, ControlsHideWhenStopped) {
- Expectation showControls = EXPECT_CALL(*mock_web_contents_observer(),
+IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest, ControlsHideWhenStopped) {
+ Expectation showControls = EXPECT_CALL(*mock_media_session_observer(),
MediaSessionStateChanged(true, false));
- EXPECT_CALL(*mock_web_contents_observer(),
+ EXPECT_CALL(*mock_media_session_observer(),
MediaSessionStateChanged(false, true))
.After(showControls);
std::unique_ptr<MockMediaSessionPlayerObserver> player_observer(
new MockMediaSessionPlayerObserver);
- StartNewPlayer(player_observer.get(),
- media::MediaContentType::Persistent);
+ StartNewPlayer(player_observer.get(), media::MediaContentType::Persistent);
RemovePlayers(player_observer.get());
@@ -638,58 +567,53 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest, ControlsHideWhenStopped) {
EXPECT_TRUE(IsSuspended());
}
-IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest, ControlsShownAcceptTransient) {
- EXPECT_CALL(*mock_web_contents_observer(),
+IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest,
+ ControlsShownAcceptTransient) {
+ EXPECT_CALL(*mock_media_session_observer(),
MediaSessionStateChanged(true, false));
std::unique_ptr<MockMediaSessionPlayerObserver> player_observer(
new MockMediaSessionPlayerObserver);
- StartNewPlayer(player_observer.get(),
- media::MediaContentType::Persistent);
+ StartNewPlayer(player_observer.get(), media::MediaContentType::Persistent);
// Transient player join the session without affecting the controls.
- StartNewPlayer(player_observer.get(),
- media::MediaContentType::Transient);
+ StartNewPlayer(player_observer.get(), media::MediaContentType::Transient);
EXPECT_TRUE(IsControllable());
EXPECT_FALSE(IsSuspended());
}
-IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
+IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest,
ControlsShownAfterContentAdded) {
Expectation dontShowControls = EXPECT_CALL(
- *mock_web_contents_observer(), MediaSessionStateChanged(false, false));
- EXPECT_CALL(*mock_web_contents_observer(),
+ *mock_media_session_observer(), MediaSessionStateChanged(false, false));
+ EXPECT_CALL(*mock_media_session_observer(),
MediaSessionStateChanged(true, false))
.After(dontShowControls);
std::unique_ptr<MockMediaSessionPlayerObserver> player_observer(
new MockMediaSessionPlayerObserver);
- StartNewPlayer(player_observer.get(),
- media::MediaContentType::Transient);
+ StartNewPlayer(player_observer.get(), media::MediaContentType::Transient);
// The controls are shown when the content player is added.
- StartNewPlayer(player_observer.get(),
- media::MediaContentType::Persistent);
+ StartNewPlayer(player_observer.get(), media::MediaContentType::Persistent);
EXPECT_TRUE(IsControllable());
EXPECT_FALSE(IsSuspended());
}
-IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
+IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest,
ControlsStayIfOnlyOnePlayerHasBeenPaused) {
- EXPECT_CALL(*mock_web_contents_observer(),
+ EXPECT_CALL(*mock_media_session_observer(),
MediaSessionStateChanged(true, false));
std::unique_ptr<MockMediaSessionPlayerObserver> player_observer(
new MockMediaSessionPlayerObserver);
- StartNewPlayer(player_observer.get(),
- media::MediaContentType::Persistent);
- StartNewPlayer(player_observer.get(),
- media::MediaContentType::Transient);
+ StartNewPlayer(player_observer.get(), media::MediaContentType::Persistent);
+ StartNewPlayer(player_observer.get(), media::MediaContentType::Transient);
// Removing only content player doesn't hide the controls since the session
// is still active.
@@ -699,20 +623,18 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
EXPECT_FALSE(IsSuspended());
}
-IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
+IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest,
ControlsHideWhenTheLastPlayerIsRemoved) {
- Expectation showControls = EXPECT_CALL(*mock_web_contents_observer(),
+ Expectation showControls = EXPECT_CALL(*mock_media_session_observer(),
MediaSessionStateChanged(true, false));
- EXPECT_CALL(*mock_web_contents_observer(),
+ EXPECT_CALL(*mock_media_session_observer(),
MediaSessionStateChanged(false, true))
.After(showControls);
std::unique_ptr<MockMediaSessionPlayerObserver> player_observer(
new MockMediaSessionPlayerObserver);
- StartNewPlayer(player_observer.get(),
- media::MediaContentType::Persistent);
- StartNewPlayer(player_observer.get(),
- media::MediaContentType::Persistent);
+ StartNewPlayer(player_observer.get(), media::MediaContentType::Persistent);
+ StartNewPlayer(player_observer.get(), media::MediaContentType::Persistent);
RemovePlayer(player_observer.get(), 0);
@@ -725,21 +647,19 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
EXPECT_TRUE(IsSuspended());
}
-IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
+IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest,
ControlsHideWhenAllThePlayersAreRemoved) {
- Expectation showControls = EXPECT_CALL(*mock_web_contents_observer(),
+ Expectation showControls = EXPECT_CALL(*mock_media_session_observer(),
MediaSessionStateChanged(true, false));
- EXPECT_CALL(*mock_web_contents_observer(),
+ EXPECT_CALL(*mock_media_session_observer(),
MediaSessionStateChanged(false, true))
.After(showControls);
std::unique_ptr<MockMediaSessionPlayerObserver> player_observer(
new MockMediaSessionPlayerObserver);
- StartNewPlayer(player_observer.get(),
- media::MediaContentType::Persistent);
- StartNewPlayer(player_observer.get(),
- media::MediaContentType::Persistent);
+ StartNewPlayer(player_observer.get(), media::MediaContentType::Persistent);
+ StartNewPlayer(player_observer.get(), media::MediaContentType::Persistent);
RemovePlayers(player_observer.get());
@@ -747,21 +667,19 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
EXPECT_TRUE(IsSuspended());
}
-IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
+IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest,
ControlsNotHideWhenTheLastPlayerIsPaused) {
- Expectation showControls = EXPECT_CALL(*mock_web_contents_observer(),
+ Expectation showControls = EXPECT_CALL(*mock_media_session_observer(),
MediaSessionStateChanged(true, false));
- EXPECT_CALL(*mock_web_contents_observer(),
+ EXPECT_CALL(*mock_media_session_observer(),
MediaSessionStateChanged(true, true))
.After(showControls);
std::unique_ptr<MockMediaSessionPlayerObserver> player_observer(
new MockMediaSessionPlayerObserver);
- StartNewPlayer(player_observer.get(),
- media::MediaContentType::Persistent);
- StartNewPlayer(player_observer.get(),
- media::MediaContentType::Persistent);
+ StartNewPlayer(player_observer.get(), media::MediaContentType::Persistent);
+ StartNewPlayer(player_observer.get(), media::MediaContentType::Persistent);
OnPlayerPaused(player_observer.get(), 0);
@@ -774,19 +692,18 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
EXPECT_TRUE(IsSuspended());
}
-IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
+IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest,
SuspendTemporaryUpdatesControls) {
- Expectation showControls = EXPECT_CALL(*mock_web_contents_observer(),
+ Expectation showControls = EXPECT_CALL(*mock_media_session_observer(),
MediaSessionStateChanged(true, false));
- EXPECT_CALL(*mock_web_contents_observer(),
+ EXPECT_CALL(*mock_media_session_observer(),
MediaSessionStateChanged(true, true))
.After(showControls);
std::unique_ptr<MockMediaSessionPlayerObserver> player_observer(
new MockMediaSessionPlayerObserver);
- StartNewPlayer(player_observer.get(),
- media::MediaContentType::Persistent);
+ StartNewPlayer(player_observer.get(), media::MediaContentType::Persistent);
SystemSuspend(true);
@@ -794,21 +711,21 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
EXPECT_TRUE(IsSuspended());
}
-IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest, ControlsUpdatedWhenResumed) {
- Expectation showControls = EXPECT_CALL(*mock_web_contents_observer(),
+IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest,
+ ControlsUpdatedWhenResumed) {
+ Expectation showControls = EXPECT_CALL(*mock_media_session_observer(),
MediaSessionStateChanged(true, false));
- Expectation pauseControls = EXPECT_CALL(*mock_web_contents_observer(),
+ Expectation pauseControls = EXPECT_CALL(*mock_media_session_observer(),
MediaSessionStateChanged(true, true))
.After(showControls);
- EXPECT_CALL(*mock_web_contents_observer(),
+ EXPECT_CALL(*mock_media_session_observer(),
MediaSessionStateChanged(true, false))
.After(pauseControls);
std::unique_ptr<MockMediaSessionPlayerObserver> player_observer(
new MockMediaSessionPlayerObserver);
- StartNewPlayer(player_observer.get(),
- media::MediaContentType::Persistent);
+ StartNewPlayer(player_observer.get(), media::MediaContentType::Persistent);
SystemSuspend(true);
SystemResume();
@@ -816,19 +733,18 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest, ControlsUpdatedWhenResumed) {
EXPECT_FALSE(IsSuspended());
}
-IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
+IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest,
ControlsHideWhenSessionSuspendedPermanently) {
- Expectation showControls = EXPECT_CALL(*mock_web_contents_observer(),
+ Expectation showControls = EXPECT_CALL(*mock_media_session_observer(),
MediaSessionStateChanged(true, false));
- EXPECT_CALL(*mock_web_contents_observer(),
+ EXPECT_CALL(*mock_media_session_observer(),
MediaSessionStateChanged(false, true))
.After(showControls);
std::unique_ptr<MockMediaSessionPlayerObserver> player_observer(
new MockMediaSessionPlayerObserver);
- StartNewPlayer(player_observer.get(),
- media::MediaContentType::Persistent);
+ StartNewPlayer(player_observer.get(), media::MediaContentType::Persistent);
SystemSuspend(false);
@@ -836,22 +752,21 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
EXPECT_TRUE(IsSuspended());
}
-IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
+IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest,
ConstrolsHideWhenSessionStops) {
- Expectation showControls = EXPECT_CALL(*mock_web_contents_observer(),
+ Expectation showControls = EXPECT_CALL(*mock_media_session_observer(),
MediaSessionStateChanged(true, false));
- Expectation pauseControls = EXPECT_CALL(*mock_web_contents_observer(),
+ Expectation pauseControls = EXPECT_CALL(*mock_media_session_observer(),
MediaSessionStateChanged(true, true))
.After(showControls);
- EXPECT_CALL(*mock_web_contents_observer(),
+ EXPECT_CALL(*mock_media_session_observer(),
MediaSessionStateChanged(false, true))
.After(pauseControls);
std::unique_ptr<MockMediaSessionPlayerObserver> player_observer(
new MockMediaSessionPlayerObserver);
- StartNewPlayer(player_observer.get(),
- media::MediaContentType::Persistent);
+ StartNewPlayer(player_observer.get(), media::MediaContentType::Persistent);
media_session_->Stop(MediaSession::SuspendType::UI);
@@ -859,120 +774,112 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
EXPECT_TRUE(IsSuspended());
}
-IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
+IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest,
ControlsHideWhenSessionChangesFromContentToTransient) {
- Expectation showControls = EXPECT_CALL(*mock_web_contents_observer(),
+ Expectation showControls = EXPECT_CALL(*mock_media_session_observer(),
MediaSessionStateChanged(true, false));
- Expectation pauseControls = EXPECT_CALL(*mock_web_contents_observer(),
+ Expectation pauseControls = EXPECT_CALL(*mock_media_session_observer(),
MediaSessionStateChanged(true, true))
.After(showControls);
- EXPECT_CALL(*mock_web_contents_observer(),
+ EXPECT_CALL(*mock_media_session_observer(),
MediaSessionStateChanged(false, false))
.After(pauseControls);
std::unique_ptr<MockMediaSessionPlayerObserver> player_observer(
new MockMediaSessionPlayerObserver);
- StartNewPlayer(player_observer.get(),
- media::MediaContentType::Persistent);
+ StartNewPlayer(player_observer.get(), media::MediaContentType::Persistent);
SystemSuspend(true);
// This should reset the session and change it to a transient, so
// hide the controls.
- StartNewPlayer(player_observer.get(),
- media::MediaContentType::Transient);
+ StartNewPlayer(player_observer.get(), media::MediaContentType::Transient);
EXPECT_FALSE(IsControllable());
EXPECT_FALSE(IsSuspended());
}
-IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
+IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest,
ControlsUpdatedWhenNewPlayerResetsSession) {
- Expectation showControls = EXPECT_CALL(*mock_web_contents_observer(),
+ Expectation showControls = EXPECT_CALL(*mock_media_session_observer(),
MediaSessionStateChanged(true, false));
- Expectation pauseControls = EXPECT_CALL(*mock_web_contents_observer(),
+ Expectation pauseControls = EXPECT_CALL(*mock_media_session_observer(),
MediaSessionStateChanged(true, true))
.After(showControls);
- EXPECT_CALL(*mock_web_contents_observer(),
+ EXPECT_CALL(*mock_media_session_observer(),
MediaSessionStateChanged(true, false))
.After(pauseControls);
std::unique_ptr<MockMediaSessionPlayerObserver> player_observer(
new MockMediaSessionPlayerObserver);
- StartNewPlayer(player_observer.get(),
- media::MediaContentType::Persistent);
+ StartNewPlayer(player_observer.get(), media::MediaContentType::Persistent);
SystemSuspend(true);
// This should reset the session and update the controls.
- StartNewPlayer(player_observer.get(),
- media::MediaContentType::Persistent);
+ StartNewPlayer(player_observer.get(), media::MediaContentType::Persistent);
EXPECT_TRUE(IsControllable());
EXPECT_FALSE(IsSuspended());
}
-IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
+IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest,
ControlsResumedWhenPlayerIsResumed) {
- Expectation showControls = EXPECT_CALL(*mock_web_contents_observer(),
+ Expectation showControls = EXPECT_CALL(*mock_media_session_observer(),
MediaSessionStateChanged(true, false));
- Expectation pauseControls = EXPECT_CALL(*mock_web_contents_observer(),
+ Expectation pauseControls = EXPECT_CALL(*mock_media_session_observer(),
MediaSessionStateChanged(true, true))
.After(showControls);
- EXPECT_CALL(*mock_web_contents_observer(),
+ EXPECT_CALL(*mock_media_session_observer(),
MediaSessionStateChanged(true, false))
.After(pauseControls);
std::unique_ptr<MockMediaSessionPlayerObserver> player_observer(
new MockMediaSessionPlayerObserver);
- StartNewPlayer(player_observer.get(),
- media::MediaContentType::Persistent);
+ StartNewPlayer(player_observer.get(), media::MediaContentType::Persistent);
SystemSuspend(true);
// This should resume the session and update the controls.
- AddPlayer(player_observer.get(), 0,
- media::MediaContentType::Persistent);
+ AddPlayer(player_observer.get(), 0, media::MediaContentType::Persistent);
EXPECT_TRUE(IsControllable());
EXPECT_FALSE(IsSuspended());
}
-IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
+IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest,
ControlsUpdatedDueToResumeSessionAction) {
- Expectation showControls = EXPECT_CALL(*mock_web_contents_observer(),
+ Expectation showControls = EXPECT_CALL(*mock_media_session_observer(),
MediaSessionStateChanged(true, false));
- EXPECT_CALL(*mock_web_contents_observer(),
+ EXPECT_CALL(*mock_media_session_observer(),
MediaSessionStateChanged(true, true))
.After(showControls);
std::unique_ptr<MockMediaSessionPlayerObserver> player_observer(
new MockMediaSessionPlayerObserver);
- StartNewPlayer(player_observer.get(),
- media::MediaContentType::Persistent);
+ StartNewPlayer(player_observer.get(), media::MediaContentType::Persistent);
UISuspend();
EXPECT_TRUE(IsControllable());
EXPECT_TRUE(IsSuspended());
}
-IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
+IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest,
ControlsUpdatedDueToSuspendSessionAction) {
- Expectation showControls = EXPECT_CALL(*mock_web_contents_observer(),
+ Expectation showControls = EXPECT_CALL(*mock_media_session_observer(),
MediaSessionStateChanged(true, false));
- Expectation pauseControls = EXPECT_CALL(*mock_web_contents_observer(),
+ Expectation pauseControls = EXPECT_CALL(*mock_media_session_observer(),
MediaSessionStateChanged(true, true))
.After(showControls);
- EXPECT_CALL(*mock_web_contents_observer(),
+ EXPECT_CALL(*mock_media_session_observer(),
MediaSessionStateChanged(true, false))
.After(pauseControls);
std::unique_ptr<MockMediaSessionPlayerObserver> player_observer(
new MockMediaSessionPlayerObserver);
- StartNewPlayer(player_observer.get(),
- media::MediaContentType::Persistent);
+ StartNewPlayer(player_observer.get(), media::MediaContentType::Persistent);
UISuspend();
UIResume();
@@ -980,12 +887,11 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
EXPECT_FALSE(IsSuspended());
}
-IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
+IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest,
DontResumeBySystemUISuspendedSessions) {
std::unique_ptr<MockMediaSessionPlayerObserver> player_observer(
new MockMediaSessionPlayerObserver);
- StartNewPlayer(player_observer.get(),
- media::MediaContentType::Persistent);
+ StartNewPlayer(player_observer.get(), media::MediaContentType::Persistent);
UISuspend();
EXPECT_TRUE(IsControllable());
@@ -996,12 +902,11 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
EXPECT_TRUE(IsSuspended());
}
-IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
+IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest,
AllowUIResumeForSystemSuspend) {
std::unique_ptr<MockMediaSessionPlayerObserver> player_observer(
new MockMediaSessionPlayerObserver);
- StartNewPlayer(player_observer.get(),
- media::MediaContentType::Persistent);
+ StartNewPlayer(player_observer.get(), media::MediaContentType::Persistent);
SystemSuspend(true);
EXPECT_TRUE(IsControllable());
@@ -1012,11 +917,10 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
EXPECT_FALSE(IsSuspended());
}
-IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest, ResumeSuspendFromUI) {
+IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest, ResumeSuspendFromUI) {
std::unique_ptr<MockMediaSessionPlayerObserver> player_observer(
new MockMediaSessionPlayerObserver);
- StartNewPlayer(player_observer.get(),
- media::MediaContentType::Persistent);
+ StartNewPlayer(player_observer.get(), media::MediaContentType::Persistent);
UISuspend();
EXPECT_TRUE(IsControllable());
@@ -1027,11 +931,10 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest, ResumeSuspendFromUI) {
EXPECT_FALSE(IsSuspended());
}
-IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest, ResumeSuspendFromSystem) {
+IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest, ResumeSuspendFromSystem) {
std::unique_ptr<MockMediaSessionPlayerObserver> player_observer(
new MockMediaSessionPlayerObserver);
- StartNewPlayer(player_observer.get(),
- media::MediaContentType::Persistent);
+ StartNewPlayer(player_observer.get(), media::MediaContentType::Persistent);
SystemSuspend(true);
EXPECT_TRUE(IsControllable());
@@ -1042,66 +945,62 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest, ResumeSuspendFromSystem) {
EXPECT_FALSE(IsSuspended());
}
-IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest, UMA_Suspended_SystemTransient) {
+IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest,
+ UMA_Suspended_SystemTransient) {
std::unique_ptr<MockMediaSessionPlayerObserver> player_observer(
new MockMediaSessionPlayerObserver);
base::HistogramTester tester;
- StartNewPlayer(player_observer.get(),
- media::MediaContentType::Persistent);
+ StartNewPlayer(player_observer.get(), media::MediaContentType::Persistent);
SystemSuspend(true);
std::unique_ptr<base::HistogramSamples> samples(
tester.GetHistogramSamplesSinceCreation("Media.Session.Suspended"));
EXPECT_EQ(1, samples->TotalCount());
- EXPECT_EQ(1, samples->GetCount(0)); // System Transient
- EXPECT_EQ(0, samples->GetCount(1)); // System Permanent
- EXPECT_EQ(0, samples->GetCount(2)); // UI
+ EXPECT_EQ(1, samples->GetCount(0)); // System Transient
+ EXPECT_EQ(0, samples->GetCount(1)); // System Permanent
+ EXPECT_EQ(0, samples->GetCount(2)); // UI
}
-
-IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
+IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest,
UMA_Suspended_SystemPermantent) {
std::unique_ptr<MockMediaSessionPlayerObserver> player_observer(
new MockMediaSessionPlayerObserver);
base::HistogramTester tester;
- StartNewPlayer(player_observer.get(),
- media::MediaContentType::Persistent);
+ StartNewPlayer(player_observer.get(), media::MediaContentType::Persistent);
SystemSuspend(false);
std::unique_ptr<base::HistogramSamples> samples(
tester.GetHistogramSamplesSinceCreation("Media.Session.Suspended"));
EXPECT_EQ(1, samples->TotalCount());
- EXPECT_EQ(0, samples->GetCount(0)); // System Transient
- EXPECT_EQ(1, samples->GetCount(1)); // System Permanent
- EXPECT_EQ(0, samples->GetCount(2)); // UI
+ EXPECT_EQ(0, samples->GetCount(0)); // System Transient
+ EXPECT_EQ(1, samples->GetCount(1)); // System Permanent
+ EXPECT_EQ(0, samples->GetCount(2)); // UI
}
-IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest, UMA_Suspended_UI) {
+IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest, UMA_Suspended_UI) {
std::unique_ptr<MockMediaSessionPlayerObserver> player_observer(
new MockMediaSessionPlayerObserver);
base::HistogramTester tester;
- StartNewPlayer(player_observer.get(),
- media::MediaContentType::Persistent);
+ StartNewPlayer(player_observer.get(), media::MediaContentType::Persistent);
UISuspend();
std::unique_ptr<base::HistogramSamples> samples(
tester.GetHistogramSamplesSinceCreation("Media.Session.Suspended"));
EXPECT_EQ(1, samples->TotalCount());
- EXPECT_EQ(0, samples->GetCount(0)); // System Transient
- EXPECT_EQ(0, samples->GetCount(1)); // System Permanent
- EXPECT_EQ(1, samples->GetCount(2)); // UI
+ EXPECT_EQ(0, samples->GetCount(0)); // System Transient
+ EXPECT_EQ(0, samples->GetCount(1)); // System Permanent
+ EXPECT_EQ(1, samples->GetCount(2)); // UI
}
-IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest, UMA_Suspended_Multiple) {
+IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest, UMA_Suspended_Multiple) {
std::unique_ptr<MockMediaSessionPlayerObserver> player_observer(
new MockMediaSessionPlayerObserver);
base::HistogramTester tester;
- StartNewPlayer(player_observer.get(),
- media::MediaContentType::Persistent);
+ StartNewPlayer(player_observer.get(), media::MediaContentType::Persistent);
UISuspend();
UIResume();
@@ -1117,18 +1016,17 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest, UMA_Suspended_Multiple) {
std::unique_ptr<base::HistogramSamples> samples(
tester.GetHistogramSamplesSinceCreation("Media.Session.Suspended"));
EXPECT_EQ(4, samples->TotalCount());
- EXPECT_EQ(1, samples->GetCount(0)); // System Transient
- EXPECT_EQ(1, samples->GetCount(1)); // System Permanent
- EXPECT_EQ(2, samples->GetCount(2)); // UI
+ EXPECT_EQ(1, samples->GetCount(0)); // System Transient
+ EXPECT_EQ(1, samples->GetCount(1)); // System Permanent
+ EXPECT_EQ(2, samples->GetCount(2)); // UI
}
-IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest, UMA_Suspended_Crossing) {
+IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest, UMA_Suspended_Crossing) {
std::unique_ptr<MockMediaSessionPlayerObserver> player_observer(
new MockMediaSessionPlayerObserver);
base::HistogramTester tester;
- StartNewPlayer(player_observer.get(),
- media::MediaContentType::Persistent);
+ StartNewPlayer(player_observer.get(), media::MediaContentType::Persistent);
UISuspend();
SystemSuspend(true);
@@ -1143,32 +1041,32 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest, UMA_Suspended_Crossing) {
std::unique_ptr<base::HistogramSamples> samples(
tester.GetHistogramSamplesSinceCreation("Media.Session.Suspended"));
EXPECT_EQ(2, samples->TotalCount());
- EXPECT_EQ(1, samples->GetCount(0)); // System Transient
- EXPECT_EQ(0, samples->GetCount(1)); // System Permanent
- EXPECT_EQ(1, samples->GetCount(2)); // UI
+ EXPECT_EQ(1, samples->GetCount(0)); // System Transient
+ EXPECT_EQ(0, samples->GetCount(1)); // System Permanent
+ EXPECT_EQ(1, samples->GetCount(2)); // UI
}
-IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest, UMA_Suspended_Stop) {
+IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest, UMA_Suspended_Stop) {
std::unique_ptr<MockMediaSessionPlayerObserver> player_observer(
new MockMediaSessionPlayerObserver);
base::HistogramTester tester;
- StartNewPlayer(player_observer.get(),
- media::MediaContentType::Persistent);
+ StartNewPlayer(player_observer.get(), media::MediaContentType::Persistent);
media_session_->Stop(MediaSession::SuspendType::UI);
std::unique_ptr<base::HistogramSamples> samples(
tester.GetHistogramSamplesSinceCreation("Media.Session.Suspended"));
EXPECT_EQ(1, samples->TotalCount());
- EXPECT_EQ(0, samples->GetCount(0)); // System Transient
- EXPECT_EQ(0, samples->GetCount(1)); // System Permanent
- EXPECT_EQ(1, samples->GetCount(2)); // UI
+ EXPECT_EQ(0, samples->GetCount(0)); // System Transient
+ EXPECT_EQ(0, samples->GetCount(1)); // System Permanent
+ EXPECT_EQ(1, samples->GetCount(2)); // UI
}
-IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest, UMA_ActiveTime_NoActivation) {
+IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest,
+ UMA_ActiveTime_NoActivation) {
base::HistogramTester tester;
- std::unique_ptr<MediaSession> media_session = CreateDummyMediaSession();
+ std::unique_ptr<MediaSessionImpl> media_session = CreateDummyMediaSession();
media_session.reset();
// A MediaSession that wasn't active doesn't register an active time.
@@ -1177,7 +1075,7 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest, UMA_ActiveTime_NoActivation) {
EXPECT_EQ(0, samples->TotalCount());
}
-IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
+IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest,
UMA_ActiveTime_SimpleActivation) {
std::unique_ptr<MockMediaSessionPlayerObserver> player_observer(
new MockMediaSessionPlayerObserver);
@@ -1189,8 +1087,7 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
media_session_uma_helper->SetClockForTest(
std::unique_ptr<base::SimpleTestTickClock>(clock));
- StartNewPlayer(player_observer.get(),
- media::MediaContentType::Persistent);
+ StartNewPlayer(player_observer.get(), media::MediaContentType::Persistent);
clock->Advance(base::TimeDelta::FromMilliseconds(1000));
media_session_->Stop(MediaSession::SuspendType::UI);
@@ -1201,7 +1098,7 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
EXPECT_EQ(1, samples->GetCount(1000));
}
-IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
+IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest,
UMA_ActiveTime_ActivationWithUISuspension) {
std::unique_ptr<MockMediaSessionPlayerObserver> player_observer(
new MockMediaSessionPlayerObserver);
@@ -1213,8 +1110,7 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
media_session_uma_helper->SetClockForTest(
std::unique_ptr<base::SimpleTestTickClock>(clock));
- StartNewPlayer(player_observer.get(),
- media::MediaContentType::Persistent);
+ StartNewPlayer(player_observer.get(), media::MediaContentType::Persistent);
clock->Advance(base::TimeDelta::FromMilliseconds(1000));
UISuspend();
@@ -1231,7 +1127,7 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
EXPECT_EQ(1, samples->GetCount(2000));
}
-IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
+IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest,
UMA_ActiveTime_ActivationWithSystemSuspension) {
std::unique_ptr<MockMediaSessionPlayerObserver> player_observer(
new MockMediaSessionPlayerObserver);
@@ -1243,8 +1139,7 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
media_session_uma_helper->SetClockForTest(
std::unique_ptr<base::SimpleTestTickClock>(clock));
- StartNewPlayer(player_observer.get(),
- media::MediaContentType::Persistent);
+ StartNewPlayer(player_observer.get(), media::MediaContentType::Persistent);
clock->Advance(base::TimeDelta::FromMilliseconds(1000));
SystemSuspend(true);
@@ -1261,7 +1156,7 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
EXPECT_EQ(1, samples->GetCount(2000));
}
-IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
+IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest,
UMA_ActiveTime_ActivateSuspendedButNotStopped) {
std::unique_ptr<MockMediaSessionPlayerObserver> player_observer(
new MockMediaSessionPlayerObserver);
@@ -1273,8 +1168,7 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
media_session_uma_helper->SetClockForTest(
std::unique_ptr<base::SimpleTestTickClock>(clock));
- StartNewPlayer(player_observer.get(),
- media::MediaContentType::Persistent);
+ StartNewPlayer(player_observer.get(), media::MediaContentType::Persistent);
clock->Advance(base::TimeDelta::FromMilliseconds(500));
SystemSuspend(true);
@@ -1295,7 +1189,7 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
}
}
-IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
+IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest,
UMA_ActiveTime_ActivateSuspendStopTwice) {
std::unique_ptr<MockMediaSessionPlayerObserver> player_observer(
new MockMediaSessionPlayerObserver);
@@ -1307,14 +1201,12 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
media_session_uma_helper->SetClockForTest(
std::unique_ptr<base::SimpleTestTickClock>(clock));
- StartNewPlayer(player_observer.get(),
- media::MediaContentType::Persistent);
+ StartNewPlayer(player_observer.get(), media::MediaContentType::Persistent);
clock->Advance(base::TimeDelta::FromMilliseconds(500));
SystemSuspend(true);
media_session_->Stop(MediaSession::SuspendType::UI);
- StartNewPlayer(player_observer.get(),
- media::MediaContentType::Persistent);
+ StartNewPlayer(player_observer.get(), media::MediaContentType::Persistent);
clock->Advance(base::TimeDelta::FromMilliseconds(5000));
SystemResume();
media_session_->Stop(MediaSession::SuspendType::UI);
@@ -1326,7 +1218,7 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
EXPECT_EQ(1, samples->GetCount(5000));
}
-IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
+IN_PROC_BROWSER_TEST_F(MediaSessionImplBrowserTest,
UMA_ActiveTime_MultipleActivations) {
std::unique_ptr<MockMediaSessionPlayerObserver> player_observer(
new MockMediaSessionPlayerObserver);
@@ -1338,13 +1230,11 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
media_session_uma_helper->SetClockForTest(
std::unique_ptr<base::SimpleTestTickClock>(clock));
- StartNewPlayer(player_observer.get(),
- media::MediaContentType::Persistent);
+ StartNewPlayer(player_observer.get(), media::MediaContentType::Persistent);
clock->Advance(base::TimeDelta::FromMilliseconds(10000));
RemovePlayer(player_observer.get(), 0);
- StartNewPlayer(player_observer.get(),
- media::MediaContentType::Persistent);
+ StartNewPlayer(player_observer.get(), media::MediaContentType::Persistent);
clock->Advance(base::TimeDelta::FromMilliseconds(1000));
media_session_->Stop(MediaSession::SuspendType::UI);
« no previous file with comments | « content/browser/media/session/media_session_impl.cc ('k') | content/browser/media/session/media_session_impl_visibility_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698