Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(235)

Unified Diff: content/browser/top_document_isolation_browsertest.cc

Issue 2879293002: Move setup of base::test::ScopedFeatureList earlier, to avoid data race. (Closed)
Patch Set: . Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/test/scoped_feature_list.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 17caf7ae0c59c10d9c3ab948df735cedfb5d59af..be1fa6e4565e9c832525e88effca4441e07634fa 100644
--- a/content/browser/top_document_isolation_browsertest.cc
+++ b/content/browser/top_document_isolation_browsertest.cc
@@ -31,8 +31,12 @@ class TopDocumentIsolationTest : public ContentBrowserTest {
return visualizer_.DepictFrameTree(node);
}
- void SetUpOnMainThread() override {
+ void SetUp() override {
scoped_feature_list_.InitAndEnableFeature(features::kTopDocumentIsolation);
+ ContentBrowserTest::SetUp();
+ }
+
+ void SetUpOnMainThread() override {
host_resolver()->AddRule("*", "127.0.0.1");
SetupCrossSiteRedirector(embedded_test_server());
ASSERT_TRUE(embedded_test_server()->Start());
« no previous file with comments | « base/test/scoped_feature_list.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698