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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1491943002: Refactoring media notification (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: added two MediaSessionBrowserTests to test MediaSession.Stop() Created 5 years 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/android/media_session.cc ('K') | « content/browser/media/android/media_session.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/media/android/media_session_browsertest.cc
diff --git a/content/browser/media/android/media_session_browsertest.cc b/content/browser/media/android/media_session_browsertest.cc
index 99553b4ac9e8c34041cc3e8275934cbfa853117e..854e402ff9378e4ae0e41ace73165e558b6e3886 100644
--- a/content/browser/media/android/media_session_browsertest.cc
+++ b/content/browser/media/android/media_session_browsertest.cc
@@ -302,6 +302,17 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest, SuspendGivesAwayAudioFocus) {
EXPECT_FALSE(HasAudioFocus());
}
+IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest, StopGivesAwayAudioFocus) {
+ scoped_ptr<MockMediaSessionObserver> media_session_observer(
+ new MockMediaSessionObserver);
+
+ StartNewPlayer(media_session_observer.get(), MediaSession::Type::Content);
+
+ media_session_->Stop();
+
+ EXPECT_FALSE(HasAudioFocus());
+}
+
IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest, ResumeGivesBackAudioFocus) {
scoped_ptr<MockMediaSessionObserver> media_session_observer(
new MockMediaSessionObserver);
@@ -652,12 +663,12 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest, ControlsUpdatedWhenResumed) {
Expectation showControls = EXPECT_CALL(*mock_web_contents_observer(),
MediaSessionStateChanged(true, false));
- Expectation pauseControls = EXPECT_CALL(*mock_web_contents_observer(),
+ Expectation hideControls = EXPECT_CALL(*mock_web_contents_observer(),
MediaSessionStateChanged(true, true))
.After(showControls);
EXPECT_CALL(*mock_web_contents_observer(),
MediaSessionStateChanged(true, false))
- .After(pauseControls);
+ .After(hideControls);
scoped_ptr<MockMediaSessionObserver> media_session_observer(
new MockMediaSessionObserver);
@@ -690,15 +701,37 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
}
IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
+ ConstrolsHideWhenSessionStops) {
+ Expectation showControls = EXPECT_CALL(*mock_web_contents_observer(),
+ MediaSessionStateChanged(true, false));
+ Expectation hideControls = EXPECT_CALL(*mock_web_contents_observer(),
+ MediaSessionStateChanged(true, true))
+ .After(showControls);
+ EXPECT_CALL(*mock_web_contents_observer(),
+ MediaSessionStateChanged(false, true))
+ .After(hideControls);
+
+ scoped_ptr<MockMediaSessionObserver> media_session_observer(
+ new MockMediaSessionObserver);
+
+ StartNewPlayer(media_session_observer.get(), MediaSession::Type::Content);
+
+ media_session_->Stop();
+
+ EXPECT_FALSE(IsControllable());
+ EXPECT_TRUE(IsSuspended());
+}
+
+IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
ControlsHideWhenSessionChangesFromContentToTransient) {
Expectation showControls = EXPECT_CALL(*mock_web_contents_observer(),
MediaSessionStateChanged(true, false));
- Expectation pauseControls = EXPECT_CALL(*mock_web_contents_observer(),
+ Expectation hideControls = EXPECT_CALL(*mock_web_contents_observer(),
MediaSessionStateChanged(true, true))
.After(showControls);
EXPECT_CALL(*mock_web_contents_observer(),
MediaSessionStateChanged(false, false))
- .After(pauseControls);
+ .After(hideControls);
scoped_ptr<MockMediaSessionObserver> media_session_observer(
new MockMediaSessionObserver);
@@ -718,12 +751,12 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
ControlsUpdatedWhenNewPlayerResetsSession) {
Expectation showControls = EXPECT_CALL(*mock_web_contents_observer(),
MediaSessionStateChanged(true, false));
- Expectation pauseControls = EXPECT_CALL(*mock_web_contents_observer(),
+ Expectation hideControls = EXPECT_CALL(*mock_web_contents_observer(),
MediaSessionStateChanged(true, true))
.After(showControls);
EXPECT_CALL(*mock_web_contents_observer(),
MediaSessionStateChanged(true, false))
- .After(pauseControls);
+ .After(hideControls);
scoped_ptr<MockMediaSessionObserver> media_session_observer(
new MockMediaSessionObserver);
@@ -742,12 +775,12 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
ControlsResumedWhenPlayerIsResumed) {
Expectation showControls = EXPECT_CALL(*mock_web_contents_observer(),
MediaSessionStateChanged(true, false));
- Expectation pauseControls = EXPECT_CALL(*mock_web_contents_observer(),
+ Expectation hideControls = EXPECT_CALL(*mock_web_contents_observer(),
MediaSessionStateChanged(true, true))
.After(showControls);
EXPECT_CALL(*mock_web_contents_observer(),
MediaSessionStateChanged(true, false))
- .After(pauseControls);
+ .After(hideControls);
whywhat 2015/12/09 16:59:27 So the test didn't change but the behavior did cha
Zhiqiang Zhang (Slow) 2015/12/09 18:02:56 Sorry, my fault. hideControls should correspond to
scoped_ptr<MockMediaSessionObserver> media_session_observer(
new MockMediaSessionObserver);
@@ -763,9 +796,11 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
}
IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
- ControlsNotUpdatedDueToResumeSessionAction) {
- EXPECT_CALL(*mock_web_contents_observer(),
+ ControlsUpdatedDueToResumeSessionAction) {
+ Expectation showControls = EXPECT_CALL(*mock_web_contents_observer(),
MediaSessionStateChanged(true, false));
+ EXPECT_CALL(*mock_web_contents_observer(),
+ MediaSessionStateChanged(true, true)).After(showControls);
scoped_ptr<MockMediaSessionObserver> media_session_observer(
new MockMediaSessionObserver);
@@ -778,9 +813,13 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
}
IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
- ControlsNotUpdatedDueToSuspendSessionAction) {
- EXPECT_CALL(*mock_web_contents_observer(),
+ ControlsUpdatedDueToSuspendSessionAction) {
+ Expectation showControls = EXPECT_CALL(*mock_web_contents_observer(),
MediaSessionStateChanged(true, false));
+ Expectation hideControls = EXPECT_CALL(*mock_web_contents_observer(),
+ MediaSessionStateChanged(true, true)).After(showControls);
+ EXPECT_CALL(*mock_web_contents_observer(),
+ MediaSessionStateChanged(true, false)).After(hideControls);
scoped_ptr<MockMediaSessionObserver> media_session_observer(
new MockMediaSessionObserver);
« content/browser/media/android/media_session.cc ('K') | « content/browser/media/android/media_session.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698