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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2015433003: Implement MediaMetadata artwork in content (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fixed tests Created 4 years, 7 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/android/browser_media_session_manager.cc ('K') | « content/browser/media/session/media_session.cc ('k') | content/browser/web_contents/web_contents_android.cc » ('j') | content/renderer/manifest/manifest_parser.h » ('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..e22f7fbf90cb912644da58e641536da012e3a5a0 100644
--- a/content/browser/media/session/media_session_browsertest.cc
+++ b/content/browser/media/session/media_session_browsertest.cc
@@ -1,3 +1,4 @@
+
// Copyright 2015 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -48,9 +49,8 @@ class MockWebContentsObserver : public WebContentsObserver {
MockWebContentsObserver(WebContents* web_contents)
: WebContentsObserver(web_contents) {}
- MOCK_METHOD3(MediaSessionStateChanged,
- void(bool is_controllable, bool is_suspended,
- const content::MediaMetadata& metadata));
+ MOCK_METHOD2(MediaSessionStateChanged,
+ void(bool is_controllable, bool is_suspended));
};
} // namespace
@@ -489,7 +489,7 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest, MediaSessionType) {
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);
@@ -503,7 +503,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);
@@ -517,9 +517,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(
@@ -535,7 +535,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);
@@ -552,9 +552,9 @@ 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::_));
+ 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(
@@ -572,7 +572,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);
@@ -591,9 +591,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);
@@ -615,9 +615,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(
@@ -635,9 +635,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(
@@ -660,9 +660,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(
@@ -678,11 +678,11 @@ 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(
@@ -699,9 +699,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(
@@ -718,11 +718,11 @@ 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(
@@ -739,11 +739,11 @@ 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(
@@ -763,11 +763,11 @@ 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(
@@ -786,11 +786,11 @@ 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(
@@ -809,9 +809,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(
@@ -827,11 +827,11 @@ 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(
« content/browser/media/android/browser_media_session_manager.cc ('K') | « content/browser/media/session/media_session.cc ('k') | content/browser/web_contents/web_contents_android.cc » ('j') | content/renderer/manifest/manifest_parser.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698