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

Side by Side Diff: content/browser/top_document_isolation_browsertest.cc

Issue 1972043002: Disable flaky TopDocumentIsolationTest.NavigateToSubframeSiteWithPopup2 on Mac (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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 unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <string> 5 #include <string>
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "content/browser/frame_host/frame_tree_node.h" 8 #include "content/browser/frame_host/frame_tree_node.h"
9 #include "content/browser/web_contents/web_contents_impl.h" 9 #include "content/browser/web_contents/web_contents_impl.h"
10 #include "content/public/common/content_switches.h" 10 #include "content/public/common/content_switches.h"
(...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after
271 EXPECT_EQ( 271 EXPECT_EQ(
272 " Site D\n" 272 " Site D\n"
273 " |--Site D\n" 273 " |--Site D\n"
274 " |--Site D\n" 274 " |--Site D\n"
275 " |--Site D\n" 275 " |--Site D\n"
276 " +--Site D\n" 276 " +--Site D\n"
277 "Where D = http://c.com/", 277 "Where D = http://c.com/",
278 DepictFrameTree(root())); 278 DepictFrameTree(root()));
279 } 279 }
280 280
281 // Flaky on Mac. See http://crbug.com/611300.
282 #if defined(OS_MACOSX)
283 #define MAYBE_NavigateToSubframeSiteWithPopup2 \
284 DISABLED_NavigateToSubframeSiteWithPopup2
285 #else
286 #define MAYBE_NavigateToSubframeSiteWithPopup2 NavigateToSubframeSiteWithPopup2
287 #endif
288
281 IN_PROC_BROWSER_TEST_F(TopDocumentIsolationTest, 289 IN_PROC_BROWSER_TEST_F(TopDocumentIsolationTest,
282 NavigateToSubframeSiteWithPopup2) { 290 MAYBE_NavigateToSubframeSiteWithPopup2) {
283 if (content::AreAllSitesIsolatedForTesting()) 291 if (content::AreAllSitesIsolatedForTesting())
284 return; // Top Document Isolation is disabled in this mode. 292 return; // Top Document Isolation is disabled in this mode.
285 293
286 // A(B, C) -> C(A, B), but while a separate C(A) popup exists. 294 // A(B, C) -> C(A, B), but while a separate C(A) popup exists.
287 // 295 //
288 // This test is constructed so that c.com is the second site to commit in the 296 // This test is constructed so that c.com is the second site to commit in the
289 // default subframe SiteInstance, so the default subframe SiteInstance does 297 // default subframe SiteInstance, so the default subframe SiteInstance does
290 // not have a "c.com" as the value of GetSiteURL(). 298 // not have a "c.com" as the value of GetSiteURL().
291 GURL abb_url(embedded_test_server()->GetURL( 299 GURL abb_url(embedded_test_server()->GetURL(
292 "a.com", "/cross_site_iframe_factory.html?a(b, b)")); 300 "a.com", "/cross_site_iframe_factory.html?a(b, b)"));
(...skipping 269 matching lines...) Expand 10 before | Expand all | Expand 10 after
562 " C = http://adnetwork.com/", 570 " C = http://adnetwork.com/",
563 DepictFrameTree(root())); 571 DepictFrameTree(root()));
564 EXPECT_EQ( 572 EXPECT_EQ(
565 " Site C ------------ proxies for B\n" 573 " Site C ------------ proxies for B\n"
566 "Where B = default subframe process\n" 574 "Where B = default subframe process\n"
567 " C = http://adnetwork.com/", 575 " C = http://adnetwork.com/",
568 DepictFrameTree(popup_root)); 576 DepictFrameTree(popup_root));
569 } 577 }
570 578
571 } // namespace content 579 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698