Commit f0a8f786 authored by Jun Mukai's avatar Jun Mukai Committed by Commit Bot

Skip WebUiScreenLocker for Mash

BUG=888779
TEST=interactive_ui_tests --enable-features=SingleProcessMash

Change-Id: If0653a7dae1e7c156f122680fd6be71b001dd9f3
Reviewed-on: https://chromium-review.googlesource.com/1244300Reviewed-by: default avatarJacob Dufault <jdufault@chromium.org>
Commit-Queue: Jun Mukai <mukai@chromium.org>
Cr-Commit-Position: refs/heads/master@{#594147}
parent 5bf0ad43
......@@ -34,6 +34,7 @@
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/base/test/ui_controls.h"
#include "ui/base/ui_base_features.h"
#include "ui/compositor/layer_animator.h"
#include "ui/compositor/scoped_animation_duration_scale_mode.h"
#include "ui/views/widget/widget.h"
......@@ -150,6 +151,11 @@ class WebUiScreenLockerTest : public ScreenLockerTest {
};
IN_PROC_BROWSER_TEST_F(WebUiScreenLockerTest, TestBasic) {
// WebUiScreenLockerTest fails with Mash because of unexpected window
// structure. Fortunately we will deprecate the WebUI-based screen locker
// soon, so it is okay to skip it. See https://crbug.com/888779
if (features::IsUsingWindowService())
return;
ScreenLocker::Show();
std::unique_ptr<test::ScreenLockerTester> tester(ScreenLocker::GetTester());
tester->EmulateWindowManagerReady();
......@@ -199,6 +205,11 @@ IN_PROC_BROWSER_TEST_F(ScreenLockerTest, LockScreenWhileAddingUser) {
// Test how locking the screen affects an active fullscreen window.
IN_PROC_BROWSER_TEST_F(WebUiScreenLockerTest, TestFullscreenExit) {
// WebUiScreenLockerTest fails with Mash because of unexpected window
// structure. Fortunately we will deprecate the WebUI-based screen locker
// soon, so it is okay to skip it. See https://crbug.com/888779
if (features::IsUsingWindowService())
return;
// 1) If the active browser window is in fullscreen and the fullscreen window
// does not have all the pixels (e.g. the shelf is auto hidden instead of
// hidden), locking the screen should not exit fullscreen. The shelf is
......
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