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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2411723002: Split MediaSessionStateChanged() and MediaSessionMetadataChanged() (Closed)
Patch Set: rebased Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/media/session/media_session.cc ('k') | content/browser/web_contents/web_contents_impl.h » ('j') | no next file with comments »
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 629c562c0f6babac2e10fbee35735d803e9a93d3..959bead12504b79f07f8d25f9799a5e648636965 100644
--- a/content/browser/media/session/media_session_browsertest.cc
+++ b/content/browser/media/session/media_session_browsertest.cc
@@ -52,9 +52,8 @@ class MockWebContentsObserver : public WebContentsObserver {
MockWebContentsObserver(WebContents* web_contents)
: WebContentsObserver(web_contents) {}
- MOCK_METHOD3(MediaSessionStateChanged,
- void(bool is_controllable, bool is_suspended,
- const base::Optional<content::MediaMetadata>& metadata));
+ MOCK_METHOD2(MediaSessionStateChanged,
+ void(bool is_controllable, bool is_suspended));
};
} // namespace
@@ -588,7 +587,7 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest, AudioFocusType) {
IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest, ControlsShowForContent) {
EXPECT_CALL(*mock_web_contents_observer(),
- MediaSessionStateChanged(true, false, testing::_));
+ MediaSessionStateChanged(true, false));
std::unique_ptr<MockMediaSessionObserver> media_session_observer(
new MockMediaSessionObserver);
@@ -603,7 +602,7 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest, ControlsShowForContent) {
IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest, ControlsNoShowForTransient) {
EXPECT_CALL(*mock_web_contents_observer(),
- MediaSessionStateChanged(false, false, testing::_));
+ MediaSessionStateChanged(false, false));
std::unique_ptr<MockMediaSessionObserver> media_session_observer(
new MockMediaSessionObserver);
@@ -618,9 +617,9 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest, ControlsNoShowForTransient) {
IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest, ControlsHideWhenStopped) {
Expectation showControls = EXPECT_CALL(*mock_web_contents_observer(),
- MediaSessionStateChanged(true, false, testing::_));
+ MediaSessionStateChanged(true, false));
EXPECT_CALL(*mock_web_contents_observer(),
- MediaSessionStateChanged(false, true, testing::_))
+ MediaSessionStateChanged(false, true))
.After(showControls);
std::unique_ptr<MockMediaSessionObserver> media_session_observer(
@@ -637,7 +636,7 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest, ControlsHideWhenStopped) {
IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest, ControlsShownAcceptTransient) {
EXPECT_CALL(*mock_web_contents_observer(),
- MediaSessionStateChanged(true, false, testing::_));
+ MediaSessionStateChanged(true, false));
std::unique_ptr<MockMediaSessionObserver> media_session_observer(
new MockMediaSessionObserver);
@@ -655,10 +654,10 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest, ControlsShownAcceptTransient) {
IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
ControlsShownAfterContentAdded) {
- Expectation dontShowControls = EXPECT_CALL(*mock_web_contents_observer(),
- MediaSessionStateChanged(false, false, testing::_));
+ Expectation dontShowControls = EXPECT_CALL(
+ *mock_web_contents_observer(), MediaSessionStateChanged(false, false));
EXPECT_CALL(*mock_web_contents_observer(),
- MediaSessionStateChanged(true, false, testing::_))
+ MediaSessionStateChanged(true, false))
.After(dontShowControls);
std::unique_ptr<MockMediaSessionObserver> media_session_observer(
@@ -678,7 +677,7 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
ControlsStayIfOnlyOnePlayerHasBeenPaused) {
EXPECT_CALL(*mock_web_contents_observer(),
- MediaSessionStateChanged(true, false, testing::_));
+ MediaSessionStateChanged(true, false));
std::unique_ptr<MockMediaSessionObserver> media_session_observer(
new MockMediaSessionObserver);
@@ -699,9 +698,9 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
ControlsHideWhenTheLastPlayerIsRemoved) {
Expectation showControls = EXPECT_CALL(*mock_web_contents_observer(),
- MediaSessionStateChanged(true, false, testing::_));
+ MediaSessionStateChanged(true, false));
EXPECT_CALL(*mock_web_contents_observer(),
- MediaSessionStateChanged(false, true, testing::_))
+ MediaSessionStateChanged(false, true))
.After(showControls);
std::unique_ptr<MockMediaSessionObserver> media_session_observer(
new MockMediaSessionObserver);
@@ -725,9 +724,9 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
ControlsHideWhenAllThePlayersAreRemoved) {
Expectation showControls = EXPECT_CALL(*mock_web_contents_observer(),
- MediaSessionStateChanged(true, false, testing::_));
+ MediaSessionStateChanged(true, false));
EXPECT_CALL(*mock_web_contents_observer(),
- MediaSessionStateChanged(false, true, testing::_))
+ MediaSessionStateChanged(false, true))
.After(showControls);
std::unique_ptr<MockMediaSessionObserver> media_session_observer(
@@ -747,9 +746,9 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
ControlsNotHideWhenTheLastPlayerIsPaused) {
Expectation showControls = EXPECT_CALL(*mock_web_contents_observer(),
- MediaSessionStateChanged(true, false, testing::_));
+ MediaSessionStateChanged(true, false));
EXPECT_CALL(*mock_web_contents_observer(),
- MediaSessionStateChanged(true, true, testing::_))
+ MediaSessionStateChanged(true, true))
.After(showControls);
std::unique_ptr<MockMediaSessionObserver> media_session_observer(
@@ -774,9 +773,9 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
SuspendTemporaryUpdatesControls) {
Expectation showControls = EXPECT_CALL(*mock_web_contents_observer(),
- MediaSessionStateChanged(true, false, testing::_));
+ MediaSessionStateChanged(true, false));
EXPECT_CALL(*mock_web_contents_observer(),
- MediaSessionStateChanged(true, true, testing::_))
+ MediaSessionStateChanged(true, true))
.After(showControls);
std::unique_ptr<MockMediaSessionObserver> media_session_observer(
@@ -793,11 +792,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, testing::_));
+ MediaSessionStateChanged(true, false));
Expectation pauseControls = EXPECT_CALL(*mock_web_contents_observer(),
- MediaSessionStateChanged(true, true, testing::_)).After(showControls);
+ MediaSessionStateChanged(true, true))
+ .After(showControls);
EXPECT_CALL(*mock_web_contents_observer(),
- MediaSessionStateChanged(true, false, testing::_))
+ MediaSessionStateChanged(true, false))
.After(pauseControls);
std::unique_ptr<MockMediaSessionObserver> media_session_observer(
@@ -815,9 +815,9 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest, ControlsUpdatedWhenResumed) {
IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
ControlsHideWhenSessionSuspendedPermanently) {
Expectation showControls = EXPECT_CALL(*mock_web_contents_observer(),
- MediaSessionStateChanged(true, false, testing::_));
+ MediaSessionStateChanged(true, false));
EXPECT_CALL(*mock_web_contents_observer(),
- MediaSessionStateChanged(false, true, testing::_))
+ MediaSessionStateChanged(false, true))
.After(showControls);
std::unique_ptr<MockMediaSessionObserver> media_session_observer(
@@ -835,11 +835,12 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
ConstrolsHideWhenSessionStops) {
Expectation showControls = EXPECT_CALL(*mock_web_contents_observer(),
- MediaSessionStateChanged(true, false, testing::_));
+ MediaSessionStateChanged(true, false));
Expectation pauseControls = EXPECT_CALL(*mock_web_contents_observer(),
- MediaSessionStateChanged(true, true, testing::_)).After(showControls);
+ MediaSessionStateChanged(true, true))
+ .After(showControls);
EXPECT_CALL(*mock_web_contents_observer(),
- MediaSessionStateChanged(false, true, testing::_))
+ MediaSessionStateChanged(false, true))
.After(pauseControls);
std::unique_ptr<MockMediaSessionObserver> media_session_observer(
@@ -857,11 +858,12 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
ControlsHideWhenSessionChangesFromContentToTransient) {
Expectation showControls = EXPECT_CALL(*mock_web_contents_observer(),
- MediaSessionStateChanged(true, false, testing::_));
+ MediaSessionStateChanged(true, false));
Expectation pauseControls = EXPECT_CALL(*mock_web_contents_observer(),
- MediaSessionStateChanged(true, true, testing::_)).After(showControls);
+ MediaSessionStateChanged(true, true))
+ .After(showControls);
EXPECT_CALL(*mock_web_contents_observer(),
- MediaSessionStateChanged(false, false, testing::_))
+ MediaSessionStateChanged(false, false))
.After(pauseControls);
std::unique_ptr<MockMediaSessionObserver> media_session_observer(
@@ -883,11 +885,12 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
ControlsUpdatedWhenNewPlayerResetsSession) {
Expectation showControls = EXPECT_CALL(*mock_web_contents_observer(),
- MediaSessionStateChanged(true, false, testing::_));
+ MediaSessionStateChanged(true, false));
Expectation pauseControls = EXPECT_CALL(*mock_web_contents_observer(),
- MediaSessionStateChanged(true, true, testing::_)).After(showControls);
+ MediaSessionStateChanged(true, true))
+ .After(showControls);
EXPECT_CALL(*mock_web_contents_observer(),
- MediaSessionStateChanged(true, false, testing::_))
+ MediaSessionStateChanged(true, false))
.After(pauseControls);
std::unique_ptr<MockMediaSessionObserver> media_session_observer(
@@ -908,11 +911,12 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
ControlsResumedWhenPlayerIsResumed) {
Expectation showControls = EXPECT_CALL(*mock_web_contents_observer(),
- MediaSessionStateChanged(true, false, testing::_));
+ MediaSessionStateChanged(true, false));
Expectation pauseControls = EXPECT_CALL(*mock_web_contents_observer(),
- MediaSessionStateChanged(true, true, testing::_)).After(showControls);
+ MediaSessionStateChanged(true, true))
+ .After(showControls);
EXPECT_CALL(*mock_web_contents_observer(),
- MediaSessionStateChanged(true, false, testing::_))
+ MediaSessionStateChanged(true, false))
.After(pauseControls);
std::unique_ptr<MockMediaSessionObserver> media_session_observer(
@@ -933,9 +937,9 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
ControlsUpdatedDueToResumeSessionAction) {
Expectation showControls = EXPECT_CALL(*mock_web_contents_observer(),
- MediaSessionStateChanged(true, false, testing::_));
+ MediaSessionStateChanged(true, false));
EXPECT_CALL(*mock_web_contents_observer(),
- MediaSessionStateChanged(true, true, testing::_))
+ MediaSessionStateChanged(true, true))
.After(showControls);
std::unique_ptr<MockMediaSessionObserver> media_session_observer(
@@ -952,11 +956,12 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest,
ControlsUpdatedDueToSuspendSessionAction) {
Expectation showControls = EXPECT_CALL(*mock_web_contents_observer(),
- MediaSessionStateChanged(true, false, testing::_));
+ MediaSessionStateChanged(true, false));
Expectation pauseControls = EXPECT_CALL(*mock_web_contents_observer(),
- MediaSessionStateChanged(true, true, testing::_)).After(showControls);
+ MediaSessionStateChanged(true, true))
+ .After(showControls);
EXPECT_CALL(*mock_web_contents_observer(),
- MediaSessionStateChanged(true, false, testing::_))
+ MediaSessionStateChanged(true, false))
.After(pauseControls);
std::unique_ptr<MockMediaSessionObserver> media_session_observer(
« no previous file with comments | « content/browser/media/session/media_session.cc ('k') | content/browser/web_contents/web_contents_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698