| OLD | NEW |
| 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 Loading... |
| 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. | 281 // Flaky on Mac and Windows. See http://crbug.com/611300. |
| 282 #if defined(OS_MACOSX) | 282 #if defined(OS_MACOSX) || defined(OS_WIN) |
| 283 #define MAYBE_NavigateToSubframeSiteWithPopup2 \ | 283 #define MAYBE_NavigateToSubframeSiteWithPopup2 \ |
| 284 DISABLED_NavigateToSubframeSiteWithPopup2 | 284 DISABLED_NavigateToSubframeSiteWithPopup2 |
| 285 #else | 285 #else |
| 286 #define MAYBE_NavigateToSubframeSiteWithPopup2 NavigateToSubframeSiteWithPopup2 | 286 #define MAYBE_NavigateToSubframeSiteWithPopup2 NavigateToSubframeSiteWithPopup2 |
| 287 #endif | 287 #endif |
| 288 | 288 |
| 289 IN_PROC_BROWSER_TEST_F(TopDocumentIsolationTest, | 289 IN_PROC_BROWSER_TEST_F(TopDocumentIsolationTest, |
| 290 MAYBE_NavigateToSubframeSiteWithPopup2) { | 290 MAYBE_NavigateToSubframeSiteWithPopup2) { |
| 291 if (content::AreAllSitesIsolatedForTesting()) | 291 if (content::AreAllSitesIsolatedForTesting()) |
| 292 return; // Top Document Isolation is disabled in this mode. | 292 return; // Top Document Isolation is disabled in this mode. |
| (...skipping 285 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 578 " C = http://adnetwork.com/", | 578 " C = http://adnetwork.com/", |
| 579 DepictFrameTree(root())); | 579 DepictFrameTree(root())); |
| 580 EXPECT_EQ( | 580 EXPECT_EQ( |
| 581 " Site C ------------ proxies for B\n" | 581 " Site C ------------ proxies for B\n" |
| 582 "Where B = default subframe process\n" | 582 "Where B = default subframe process\n" |
| 583 " C = http://adnetwork.com/", | 583 " C = http://adnetwork.com/", |
| 584 DepictFrameTree(popup_root)); | 584 DepictFrameTree(popup_root)); |
| 585 } | 585 } |
| 586 | 586 |
| 587 } // namespace content | 587 } // namespace content |
| OLD | NEW |