Reland "cbui: disable PageInfoBubbleView focus tests on Mac"

This is a reland of 1e92aab4

Original change's description:
> 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/+/1946394
> Reviewed-by: Avi Drissman <avi@chromium.org>
> Commit-Queue: Elly Fong-Jones <ellyjones@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#720629}

Bug: 1029882, 1028239
Change-Id: I6077af8cd9431e069c766c71717a92de670ed210
Tbr: avi@chromium.org
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1945895
Commit-Queue: Elly Fong-Jones <ellyjones@chromium.org>
Reviewed-by: Elly Fong-Jones <ellyjones@chromium.org>
Cr-Commit-Position: refs/heads/master@{#720665}

chrome/browser/ui/views/page_info/page_info_bubble_view_browsertest.cc

@@ -887,10 +887,17 @@ class ViewFocusTracker : public FocusTracker, public views::ViewObserver {
 
 }  // 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
 // contents pane.
 IN_PROC_BROWSER_TEST_F(PageInfoBubbleViewBrowserTest,
-                       FocusReturnsToContentOnClose) {
+                       MAYBE_FocusReturnsToContentOnClose) {
   content::WebContents* const web_contents =
       browser()->tab_strip_model()->GetActiveWebContents();
   WebContentsFocusTracker web_contents_focus_tracker(web_contents);
@@ -908,12 +915,21 @@ IN_PROC_BROWSER_TEST_F(PageInfoBubbleViewBrowserTest,
   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
 // 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
 // before getting back to web contents (see https://crbug.com/910067).
 IN_PROC_BROWSER_TEST_F(PageInfoBubbleViewBrowserTest,
-                       FocusDoesNotReturnToContentsOnReloadPrompt) {
+                       MAYBE_FocusDoesNotReturnToContentsOnReloadPrompt) {
   content::WebContents* const web_contents =
       browser()->tab_strip_model()->GetActiveWebContents();
   WebContentsFocusTracker web_contents_focus_tracker(web_contents);