Commit 9934ccbc authored by jdoerrie's avatar jdoerrie Committed by Commit Bot

Disable Failing TopDocumentIsolationTests on Windows

This change disables failing TopDocumentIsolationTests on Windows.

http://uberchromegw/i/official.desktop.continuous/builders/win64%20trunk/builds/19098

TBR=creis@chromium.org

Bug: 746063
Change-Id: I3e77e55e5c30d55906f8ff5885eddc319a6e72bd
Reviewed-on: https://chromium-review.googlesource.com/575973Reviewed-by: default avatarJan Wilken Dörrie <jdoerrie@chromium.org>
Commit-Queue: Jan Wilken Dörrie <jdoerrie@chromium.org>
Cr-Commit-Position: refs/heads/master@{#487790}
parent cb183afb
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
#include "base/command_line.h" #include "base/command_line.h"
#include "base/test/scoped_feature_list.h" #include "base/test/scoped_feature_list.h"
#include "build/build_config.h"
#include "content/browser/frame_host/frame_tree_node.h" #include "content/browser/frame_host/frame_tree_node.h"
#include "content/browser/web_contents/web_contents_impl.h" #include "content/browser/web_contents/web_contents_impl.h"
#include "content/public/common/content_features.h" #include "content/public/common/content_features.h"
...@@ -133,7 +134,14 @@ IN_PROC_BROWSER_TEST_F(TopDocumentIsolationTest, ReturnToTopSite) { ...@@ -133,7 +134,14 @@ IN_PROC_BROWSER_TEST_F(TopDocumentIsolationTest, ReturnToTopSite) {
DepictFrameTree(root())); DepictFrameTree(root()));
} }
IN_PROC_BROWSER_TEST_F(TopDocumentIsolationTest, NavigateSubframeToTopSite) { // Crashes on Win only. https://crbug.com/746063
#if defined(OS_WIN)
#define MAYBE_NavigateSubframeToTopSite DISABLED_NavigateSubframeToTopSite
#else
#define MAYBE_NavigateSubframeToTopSite NavigateSubframeToTopSite
#endif
IN_PROC_BROWSER_TEST_F(TopDocumentIsolationTest,
MAYBE_NavigateSubframeToTopSite) {
if (content::AreAllSitesIsolatedForTesting()) if (content::AreAllSitesIsolatedForTesting())
return; // Top Document Isolation is disabled in this mode. return; // Top Document Isolation is disabled in this mode.
...@@ -195,8 +203,15 @@ IN_PROC_BROWSER_TEST_F(TopDocumentIsolationTest, NavigateToSubframeSite) { ...@@ -195,8 +203,15 @@ IN_PROC_BROWSER_TEST_F(TopDocumentIsolationTest, NavigateToSubframeSite) {
DepictFrameTree(root())); DepictFrameTree(root()));
} }
// Crashes on Win only. https://crbug.com/746063
#if defined(OS_WIN)
#define MAYBE_NavigateToSubframeSiteWithPopup \
DISABLED_NavigateToSubframeSiteWithPopup
#else
#define MAYBE_NavigateToSubframeSiteWithPopup NavigateToSubframeSiteWithPopup
#endif
IN_PROC_BROWSER_TEST_F(TopDocumentIsolationTest, IN_PROC_BROWSER_TEST_F(TopDocumentIsolationTest,
NavigateToSubframeSiteWithPopup) { MAYBE_NavigateToSubframeSiteWithPopup) {
if (content::AreAllSitesIsolatedForTesting()) if (content::AreAllSitesIsolatedForTesting())
return; // Top Document Isolation is disabled in this mode. return; // Top Document Isolation is disabled in this mode.
...@@ -283,8 +298,15 @@ IN_PROC_BROWSER_TEST_F(TopDocumentIsolationTest, ...@@ -283,8 +298,15 @@ IN_PROC_BROWSER_TEST_F(TopDocumentIsolationTest,
DepictFrameTree(root())); DepictFrameTree(root()));
} }
// Crashes on Win only. https://crbug.com/746063
#if defined(OS_WIN)
#define MAYBE_NavigateToSubframeSiteWithPopup2 \
DISABLED_NavigateToSubframeSiteWithPopup2
#else
#define MAYBE_NavigateToSubframeSiteWithPopup2 NavigateToSubframeSiteWithPopup2
#endif
IN_PROC_BROWSER_TEST_F(TopDocumentIsolationTest, IN_PROC_BROWSER_TEST_F(TopDocumentIsolationTest,
NavigateToSubframeSiteWithPopup2) { MAYBE_NavigateToSubframeSiteWithPopup2) {
if (content::AreAllSitesIsolatedForTesting()) if (content::AreAllSitesIsolatedForTesting())
return; // Top Document Isolation is disabled in this mode. return; // Top Document Isolation is disabled in this mode.
...@@ -399,7 +421,13 @@ IN_PROC_BROWSER_TEST_F(TopDocumentIsolationTest, ...@@ -399,7 +421,13 @@ IN_PROC_BROWSER_TEST_F(TopDocumentIsolationTest,
DepictFrameTree(root())); DepictFrameTree(root()));
} }
IN_PROC_BROWSER_TEST_F(TopDocumentIsolationTest, FramesForSitesInHistory) { // Crashes on Win only. https://crbug.com/746063
#if defined(OS_WIN)
#define MAYBE_FrameForSitesInHistory DISABLED_FrameForSitesInHistory
#else
#define MAYBE_FrameForSitesInHistory FrameForSitesInHistory
#endif
IN_PROC_BROWSER_TEST_F(TopDocumentIsolationTest, MAYBE_FrameForSitesInHistory) {
if (content::AreAllSitesIsolatedForTesting()) if (content::AreAllSitesIsolatedForTesting())
return; // Top Document Isolation is disabled in this mode. return; // Top Document Isolation is disabled in this mode.
......
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