| Index: content/browser/top_document_isolation_browsertest.cc
|
| diff --git a/content/browser/top_document_isolation_browsertest.cc b/content/browser/top_document_isolation_browsertest.cc
|
| index dd4541f23185caed04f5107cef2316f837af94ba..31ce75ae998e83d04ba7d14c00a0d04a5e6b9049 100644
|
| --- a/content/browser/top_document_isolation_browsertest.cc
|
| +++ b/content/browser/top_document_isolation_browsertest.cc
|
| @@ -278,8 +278,16 @@ IN_PROC_BROWSER_TEST_F(TopDocumentIsolationTest,
|
| DepictFrameTree(root()));
|
| }
|
|
|
| +// Flaky on Mac. See http://crbug.com/611300.
|
| +#if defined(OS_MACOSX)
|
| +#define MAYBE_NavigateToSubframeSiteWithPopup2 \
|
| + DISABLED_NavigateToSubframeSiteWithPopup2
|
| +#else
|
| +#define MAYBE_NavigateToSubframeSiteWithPopup2 NavigateToSubframeSiteWithPopup2
|
| +#endif
|
| +
|
| IN_PROC_BROWSER_TEST_F(TopDocumentIsolationTest,
|
| - NavigateToSubframeSiteWithPopup2) {
|
| + MAYBE_NavigateToSubframeSiteWithPopup2) {
|
| if (content::AreAllSitesIsolatedForTesting())
|
| return; // Top Document Isolation is disabled in this mode.
|
|
|
|
|