| 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 bca52ee136668dde5490ca319ac181a6667af153..b0409db840625a8689289aec953c485ae552759d 100644
|
| --- a/content/browser/top_document_isolation_browsertest.cc
|
| +++ b/content/browser/top_document_isolation_browsertest.cc
|
| @@ -278,16 +278,9 @@ IN_PROC_BROWSER_TEST_F(TopDocumentIsolationTest,
|
| DepictFrameTree(root()));
|
| }
|
|
|
| -// Flaky on Mac and Windows. See http://crbug.com/611300.
|
| -#if defined(OS_MACOSX) || defined(OS_WIN)
|
| -#define MAYBE_NavigateToSubframeSiteWithPopup2 \
|
| - DISABLED_NavigateToSubframeSiteWithPopup2
|
| -#else
|
| -#define MAYBE_NavigateToSubframeSiteWithPopup2 NavigateToSubframeSiteWithPopup2
|
| -#endif
|
| -
|
| +// Flaky. See http://crbug.com/611300.
|
| IN_PROC_BROWSER_TEST_F(TopDocumentIsolationTest,
|
| - MAYBE_NavigateToSubframeSiteWithPopup2) {
|
| + DISABLED_NavigateToSubframeSiteWithPopup2) {
|
| if (content::AreAllSitesIsolatedForTesting())
|
| return; // Top Document Isolation is disabled in this mode.
|
|
|
|
|