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

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

Issue 2821303004: cros: Suspend media sessions with display off trigger by tablet power button (Closed)
Patch Set: rebase Created 3 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
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 c33254eaf38693198b5dab47b20339b118214221..0339ba0cc8b8edf88fa5e1fa7e2977f4ff3a1417 100644
--- a/content/browser/media/session/media_session_browsertest.cc
+++ b/content/browser/media/session/media_session_browsertest.cc
@@ -111,8 +111,8 @@ class MediaSessionBrowserTest : public ContentBrowserTest {
} // anonymous namespace
-#if !defined(OS_ANDROID)
-// The feature can't be disabled on Android.
+#if !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
+// The feature can't be disabled on Android and Chrome OS.
IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest, MediaSessionNoOpWhenDisabled) {
NavigateToURL(shell(), GetTestUrl("media/session", "media-session.html"));
@@ -129,7 +129,7 @@ IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest, MediaSessionNoOpWhenDisabled) {
EXPECT_FALSE(IsPlaying(shell(), "long-audio"));
EXPECT_TRUE(IsPlaying(shell(), "long-video"));
}
-#endif // !defined(OS_ANDROID)
+#endif // !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
IN_PROC_BROWSER_TEST_F(MediaSessionBrowserTest, SimplePlayPause) {
EnableInternalMediaSesion();
« no previous file with comments | « chrome/browser/ui/ash/chrome_shell_delegate.cc ('k') | content/browser/media/session/media_session_controllers_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698