Commit 1e92aab4 authored by Elly Fong-Jones's avatar Elly Fong-Jones Committed by Commit Bot

cbui: disable PageInfoBubbleView focus tests on Mac

These tests don't work on Mac - it's possible that they never did, or
they may have broken recently. Unfortunately the entire suite is
disabled (see issue 899286). This change marks these two tests
explicitly disabled pending a real fix.

Bug: 1029882, 1028239
Change-Id: I3a11ae61470850fd55ad95353c7eacd4ac516169
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1946394Reviewed-by: default avatarAvi Drissman <avi@chromium.org>
Commit-Queue: Elly Fong-Jones <ellyjones@chromium.org>
Cr-Commit-Position: refs/heads/master@{#720629}
parent ad705bd3
...@@ -887,10 +887,17 @@ class ViewFocusTracker : public FocusTracker, public views::ViewObserver { ...@@ -887,10 +887,17 @@ class ViewFocusTracker : public FocusTracker, public views::ViewObserver {
} // namespace } // namespace
#if defined(OS_MACOSX)
// https://crbug.com/1029882
#define MAYBE_FocusReturnsToContentOnClose DISABLED_FocusReturnsToContentOnClose
#else
#define MAYBE_FocusReturnsToContentOnClose FocusReturnsToContentOnClose
#endif
// Test that when the PageInfo bubble is closed, focus is returned to the web // Test that when the PageInfo bubble is closed, focus is returned to the web
// contents pane. // contents pane.
IN_PROC_BROWSER_TEST_F(PageInfoBubbleViewBrowserTest, IN_PROC_BROWSER_TEST_F(PageInfoBubbleViewBrowserTest,
FocusReturnsToContentOnClose) { MAYBE_FocusReturnsToContentOnClose) {
content::WebContents* const web_contents = content::WebContents* const web_contents =
browser()->tab_strip_model()->GetActiveWebContents(); browser()->tab_strip_model()->GetActiveWebContents();
WebContentsFocusTracker web_contents_focus_tracker(web_contents); WebContentsFocusTracker web_contents_focus_tracker(web_contents);
...@@ -908,12 +915,21 @@ IN_PROC_BROWSER_TEST_F(PageInfoBubbleViewBrowserTest, ...@@ -908,12 +915,21 @@ IN_PROC_BROWSER_TEST_F(PageInfoBubbleViewBrowserTest,
EXPECT_TRUE(web_contents_focus_tracker.focused()); EXPECT_TRUE(web_contents_focus_tracker.focused());
} }
#if defined(OS_MACOSX)
// https://crbug.com/1029882
#define MAYBE_FocusDoesNotReturnToContentsOnReloadPrompt \
DISABLED_FocusDoesNotReturnToContentsOnReloadPrompt
#else
#define MAYBE_FocusDoesNotReturnToContentsOnReloadPrompt \
FocusDoesNotReturnToContentsOnReloadPrompt
#endif
// Test that when the PageInfo bubble is closed and a reload prompt is // Test that when the PageInfo bubble is closed and a reload prompt is
// displayed, focus is NOT returned to the web contents pane, but rather returns // displayed, focus is NOT returned to the web contents pane, but rather returns
// to the location bar so accessibility users must tab through the reload prompt // to the location bar so accessibility users must tab through the reload prompt
// before getting back to web contents (see https://crbug.com/910067). // before getting back to web contents (see https://crbug.com/910067).
IN_PROC_BROWSER_TEST_F(PageInfoBubbleViewBrowserTest, IN_PROC_BROWSER_TEST_F(PageInfoBubbleViewBrowserTest,
FocusDoesNotReturnToContentsOnReloadPrompt) { MAYBE_FocusDoesNotReturnToContentsOnReloadPrompt) {
content::WebContents* const web_contents = content::WebContents* const web_contents =
browser()->tab_strip_model()->GetActiveWebContents(); browser()->tab_strip_model()->GetActiveWebContents();
WebContentsFocusTracker web_contents_focus_tracker(web_contents); WebContentsFocusTracker web_contents_focus_tracker(web_contents);
......
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