Commit 559b0514 authored by Aga Wronska's avatar Aga Wronska Committed by Commit Bot

Add additional test for disabling media when time limits are reached

Bug: 1008189
Change-Id: Iab2a10cb9e8e6a5f3737b0515308ad5213a41776
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1864624Reviewed-by: default avatarMichael Giuffrida <michaelpg@chromium.org>
Reviewed-by: default avatarXiyuan Xia <xiyuan@chromium.org>
Commit-Queue: Aga Wronska <agawronska@chromium.org>
Cr-Commit-Position: refs/heads/master@{#708001}
parent 2f5821f1
......@@ -1957,7 +1957,9 @@ TEST_F(LockContentsViewUnitTest, DisabledAuthMessageFocusBehavior) {
EXPECT_TRUE(HasFocusInAnyChildView(status_area));
}
TEST_F(LockContentsViewUnitTest, DisableAuthAndMediaControls) {
// Tests that media controls do not show on lock screen when auth is disabled
// after media session changes to playing.
TEST_F(LockContentsViewUnitTest, DisableAuthAfterMediaSessionChanged) {
base::test::ScopedFeatureList feature_list;
feature_list.InitAndEnableFeature(features::kLockScreenMediaControls);
......@@ -1987,6 +1989,38 @@ TEST_F(LockContentsViewUnitTest, DisableAuthAndMediaControls) {
EXPECT_FALSE(lock_contents.media_controls_view()->IsDrawn());
}
// Tests that media controls do not show on lock screen when auth is disabled
// before media session changes to playing.
TEST_F(LockContentsViewUnitTest, DisableAuthBeforeMediaSessionChanged) {
base::test::ScopedFeatureList feature_list;
feature_list.InitAndEnableFeature(features::kLockScreenMediaControls);
auto* contents = new LockContentsView(
mojom::TrayActionState::kNotAvailable, LockScreen::ScreenType::kLock,
DataDispatcher(),
std::make_unique<FakeLoginDetachableBaseModel>(DataDispatcher()));
SetUserCount(1);
std::unique_ptr<views::Widget> widget = CreateWidgetWithContent(contents);
const AccountId& kFirstUserAccountId = users()[0].basic_user_info.account_id;
LockContentsView::TestApi lock_contents(contents);
// Disable auth and media.
DataDispatcher()->DisableAuthForUser(
kFirstUserAccountId,
AuthDisabledData(ash::AuthDisabledReason::kTimeWindowLimit,
base::Time::Now() + base::TimeDelta::FromHours(8),
base::TimeDelta::FromHours(1),
true /*disable_lock_screen_media*/));
EXPECT_FALSE(lock_contents.media_controls_view()->IsDrawn());
// Simulate playing media session.
SimulateMediaSessionChanged(
lock_contents.media_controls_view(),
media_session::mojom::MediaPlaybackState::kPlaying);
EXPECT_FALSE(lock_contents.media_controls_view()->IsDrawn());
}
TEST_F(LockContentsViewUnitTest, DisableAuthAllowMediaControls) {
base::test::ScopedFeatureList feature_list;
feature_list.InitAndEnableFeature(features::kLockScreenMediaControls);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment