Commit aee10624 authored by Charlie Reis's avatar Charlie Reis Committed by Commit Bot

Revert "Disable Failing TopDocumentIsolationTests on Windows"

This reverts commit 9934ccbc.

Reason for revert: Many content_browsertests are timing out on the official builder due to https://crbug.com/650175, which should be solved separately.  These individual tests shouldn't be disabled on all Windows bots.

Original change's description:
> 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/575973
> Reviewed-by: Jan Wilken Dörrie <jdoerrie@chromium.org>
> Commit-Queue: Jan Wilken Dörrie <jdoerrie@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#487790}

TBR=creis@chromium.org,jdoerrie@chromium.org

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: 746063
Change-Id: I45a9407a9ee0ac6bdd25d2b638d42421b0392881
Reviewed-on: https://chromium-review.googlesource.com/594690Reviewed-by: default avatarCharlie Reis <creis@chromium.org>
Commit-Queue: Charlie Reis <creis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#490822}
parent 3277cf07
......@@ -6,7 +6,6 @@
#include "base/command_line.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/web_contents/web_contents_impl.h"
#include "content/public/common/content_features.h"
......@@ -134,14 +133,7 @@ IN_PROC_BROWSER_TEST_F(TopDocumentIsolationTest, ReturnToTopSite) {
DepictFrameTree(root()));
}
// 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) {
IN_PROC_BROWSER_TEST_F(TopDocumentIsolationTest, NavigateSubframeToTopSite) {
if (content::AreAllSitesIsolatedForTesting())
return; // Top Document Isolation is disabled in this mode.
......@@ -203,15 +195,8 @@ IN_PROC_BROWSER_TEST_F(TopDocumentIsolationTest, NavigateToSubframeSite) {
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,
MAYBE_NavigateToSubframeSiteWithPopup) {
NavigateToSubframeSiteWithPopup) {
if (content::AreAllSitesIsolatedForTesting())
return; // Top Document Isolation is disabled in this mode.
......@@ -298,15 +283,8 @@ IN_PROC_BROWSER_TEST_F(TopDocumentIsolationTest,
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,
MAYBE_NavigateToSubframeSiteWithPopup2) {
NavigateToSubframeSiteWithPopup2) {
if (content::AreAllSitesIsolatedForTesting())
return; // Top Document Isolation is disabled in this mode.
......@@ -421,13 +399,7 @@ IN_PROC_BROWSER_TEST_F(TopDocumentIsolationTest,
DepictFrameTree(root()));
}
// 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) {
IN_PROC_BROWSER_TEST_F(TopDocumentIsolationTest, FramesForSitesInHistory) {
if (content::AreAllSitesIsolatedForTesting())
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