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

Unified Diff: content/renderer/media/renderer_webmediaplayer_delegate_browsertest.cc

Issue 2681863005: [Video] MediaSession API event handlers can resume background video. (Closed)
Patch Set: Updated the comment in ComputePlayState Created 3 years, 10 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/renderer/media/renderer_webmediaplayer_delegate_browsertest.cc
diff --git a/content/renderer/media/renderer_webmediaplayer_delegate_browsertest.cc b/content/renderer/media/renderer_webmediaplayer_delegate_browsertest.cc
index 986102445492a938f7f196dbc643f959810dba1b..2626274c709f8b2c7775e82b0ca83a907539f96b 100644
--- a/content/renderer/media/renderer_webmediaplayer_delegate_browsertest.cc
+++ b/content/renderer/media/renderer_webmediaplayer_delegate_browsertest.cc
@@ -69,10 +69,6 @@ class RendererWebMediaPlayerDelegateTest : public content::RenderViewTest {
protected:
IPC::TestSink& test_sink() { return render_thread_->sink(); }
- void SetBackgroundVideoPlaybackUnlocked(bool is_unlocked) {
- delegate_manager_->background_video_allowed_ = is_unlocked;
- }
-
void CallOnMediaDelegatePlay(int delegate_id) {
delegate_manager_->OnMediaDelegatePlay(delegate_id);
}
@@ -275,41 +271,6 @@ TEST_F(RendererWebMediaPlayerDelegateTest, IdleDelegatesAreSuspended) {
}
}
-TEST_F(RendererWebMediaPlayerDelegateTest, IsBackgroundVideoPlaybackUnlocked) {
- NiceMock<MockWebMediaPlayerDelegateObserver> observer;
- int delegate_id = delegate_manager_->AddObserver(&observer);
- EXPECT_FALSE(delegate_manager_->IsBackgroundVideoPlaybackUnlocked());
-
- // Showing the frame always clears the flag.
- SetBackgroundVideoPlaybackUnlocked(true);
- delegate_manager_->WasShown();
- EXPECT_FALSE(delegate_manager_->IsBackgroundVideoPlaybackUnlocked());
-
- // Pausing a currently playing video clears the flag.
- delegate_manager_->DidPlay(delegate_id, true, true,
- MediaContentType::Persistent);
- SetBackgroundVideoPlaybackUnlocked(true);
- CallOnMediaDelegatePause(delegate_id);
- EXPECT_FALSE(delegate_manager_->IsBackgroundVideoPlaybackUnlocked());
-
- // TODO(avayvod): this test can't mock the IsFrameHidden() method.
- // Just test that the value changes or doesn't depending on whether the video
- // is currently playing.
- if (delegate_manager_->IsFrameHidden()) {
- SetBackgroundVideoPlaybackUnlocked(false);
- CallOnMediaDelegatePlay(delegate_id);
- EXPECT_TRUE(delegate_manager_->IsBackgroundVideoPlaybackUnlocked());
- CallOnMediaDelegatePause(delegate_id);
- EXPECT_FALSE(delegate_manager_->IsBackgroundVideoPlaybackUnlocked());
- } else {
- SetBackgroundVideoPlaybackUnlocked(false);
- CallOnMediaDelegatePlay(delegate_id);
- EXPECT_FALSE(delegate_manager_->IsBackgroundVideoPlaybackUnlocked());
- CallOnMediaDelegatePause(delegate_id);
- EXPECT_FALSE(delegate_manager_->IsBackgroundVideoPlaybackUnlocked());
- }
-}
-
#if defined(OS_ANDROID)
TEST_F(RendererWebMediaPlayerDelegateTest, Histograms) {
« no previous file with comments | « content/renderer/media/renderer_webmediaplayer_delegate.cc ('k') | content/renderer/media/webmediaplayer_ms_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698