Commit a380d683 authored by Wei Li's avatar Wei Li Committed by Commit Bot

Re-enable flaky KioskHasNoLocationBar test

Browser in kiosk mode enters full screen mode, which might be flaky on
Mac. So we use faked platform fullscreen for this test.

Bug: 920582
Change-Id: I04216a517c3a06957389fb21cabe4d8f4003a53a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2382428Reviewed-by: default avatarElly Fong-Jones <ellyjones@chromium.org>
Commit-Queue: Wei Li <weili@chromium.org>
Cr-Commit-Position: refs/heads/master@{#803626}
parent 9d0615b8
......@@ -90,9 +90,8 @@ IN_PROC_BROWSER_TEST_F(PermissionBubbleBrowserTest, AppHasNoLocationBar) {
EXPECT_FALSE(HasVisibleLocationBarForBrowser(app_browser));
}
// Crashes. http://crbug.com/920582
IN_PROC_BROWSER_TEST_F(PermissionBubbleKioskBrowserTest,
DISABLED_KioskHasNoLocationBar) {
KioskHasNoLocationBar) {
ShowBubble(browser());
// Kiosk mode on Mac has no location bar.
EXPECT_FALSE(HasVisibleLocationBarForBrowser(browser()));
......
......@@ -9,8 +9,10 @@
#include <vector>
#include "base/macros.h"
#include "build/build_config.h"
#include "chrome/browser/extensions/extension_browsertest.h"
#include "components/permissions/permission_prompt.h"
#include "ui/base/test/scoped_fake_nswindow_fullscreen.h"
namespace base {
class CommandLine;
......@@ -78,6 +80,14 @@ class PermissionBubbleKioskBrowserTest : public PermissionBubbleBrowserTest {
void SetUpCommandLine(base::CommandLine* command_line) override;
private:
#if defined(OS_MAC)
// Toggling fullscreen mode on Mac can be flaky for tests run in parallel
// because only one window may be animating into or out of fullscreen at a
// time.
ui::test::ScopedFakeNSWindowFullscreen faked_fullscreen_;
#endif
DISALLOW_COPY_AND_ASSIGN(PermissionBubbleKioskBrowserTest);
};
......
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