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

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

Issue 2367253007: Prevent reentrant cleanup events for idle delegates. (Closed)
Patch Set: Comments. Created 4 years, 3 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/renderer/media/renderer_webmediaplayer_delegate.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 fecd5726cfd0f06986a6d09e9b4cd16f70a6c82a..31d983d3b79b34d013a83f17fad24fd5df64bcb5 100644
--- a/content/renderer/media/renderer_webmediaplayer_delegate_browsertest.cc
+++ b/content/renderer/media/renderer_webmediaplayer_delegate_browsertest.cc
@@ -248,6 +248,44 @@ TEST_F(RendererWebMediaPlayerDelegateTest, MaxLowEndIdleDelegates) {
run_loop.Run();
}
+TEST_F(RendererWebMediaPlayerDelegateTest, ReentrantIdleDelegates) {
+ // Start the tick clock off at a non-null value.
+ base::SimpleTestTickClock tick_clock;
+ tick_clock.Advance(base::TimeDelta::FromSeconds(1234));
+
+ const base::TimeDelta kIdleTimeout = base::TimeDelta::FromSeconds(10);
+ delegate_manager_->SetIdleCleanupParamsForTesting(kIdleTimeout, &tick_clock,
+ true);
+ EXPECT_FALSE(delegate_manager_->IsIdleCleanupTimerRunningForTesting());
+
+ // Add two observers, both of which should keep the idle timer running.
+ testing::StrictMock<MockWebMediaPlayerDelegateObserver> observer_1;
+ const int delegate_id_1 = delegate_manager_->AddObserver(&observer_1);
+ EXPECT_TRUE(delegate_manager_->IsIdleCleanupTimerRunningForTesting());
+
+ testing::StrictMock<MockWebMediaPlayerDelegateObserver> observer_2;
+ const int delegate_id_2 = delegate_manager_->AddObserver(&observer_2);
+ EXPECT_TRUE(delegate_manager_->IsIdleCleanupTimerRunningForTesting());
+
+ testing::StrictMock<MockWebMediaPlayerDelegateObserver> observer_3;
+ EXPECT_CALL(observer_1, OnSuspendRequested(false))
+ .WillOnce(RunClosure(base::Bind(&RendererWebMediaPlayerDelegate::DidPause,
+ base::Unretained(delegate_manager_.get()),
+ delegate_id_1, false)));
+ EXPECT_CALL(observer_2, OnSuspendRequested(false))
+ .WillOnce(RunClosure(base::Bind(&RendererWebMediaPlayerDelegate::DidPause,
+ base::Unretained(delegate_manager_.get()),
+ delegate_id_2, false)));
+ base::RunLoop run_loop;
+ base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE,
+ run_loop.QuitClosure());
+ tick_clock.Advance(base::TimeDelta::FromMicroseconds(1));
+ // Adding the third observer should force idle cleanup.
+ delegate_manager_->AddObserver(&observer_3);
+ EXPECT_TRUE(delegate_manager_->IsIdleCleanupTimerRunningForTesting());
+ run_loop.Run();
+}
+
TEST_F(RendererWebMediaPlayerDelegateTest, IdleDelegatesAreSuspended) {
// Start the tick clock off at a non-null value.
base::SimpleTestTickClock tick_clock;
« no previous file with comments | « content/renderer/media/renderer_webmediaplayer_delegate.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698