| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "content/browser/site_per_process_browsertest.h" | 5 #include "content/browser/site_per_process_browsertest.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 1530 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1541 { | 1541 { |
| 1542 TestNavigationObserver observer(shell()->web_contents()); | 1542 TestNavigationObserver observer(shell()->web_contents()); |
| 1543 TestFrameNavigationObserver navigation_observer(child); | 1543 TestFrameNavigationObserver navigation_observer(child); |
| 1544 NavigationController::LoadURLParams params(cross_site_url); | 1544 NavigationController::LoadURLParams params(cross_site_url); |
| 1545 params.transition_type = PageTransitionFromInt(ui::PAGE_TRANSITION_LINK); | 1545 params.transition_type = PageTransitionFromInt(ui::PAGE_TRANSITION_LINK); |
| 1546 params.frame_tree_node_id = child->frame_tree_node_id(); | 1546 params.frame_tree_node_id = child->frame_tree_node_id(); |
| 1547 child->navigator()->GetController()->LoadURLWithParams(params); | 1547 child->navigator()->GetController()->LoadURLWithParams(params); |
| 1548 | 1548 |
| 1549 if (browser_side_navigation) { | 1549 if (browser_side_navigation) { |
| 1550 site = child->render_manager() | 1550 site = child->render_manager() |
| 1551 ->speculative_frame_host_for_testing() | 1551 ->speculative_frame_host() |
| 1552 ->GetSiteInstance(); | 1552 ->GetSiteInstance(); |
| 1553 } else { | 1553 } else { |
| 1554 site = child->render_manager()->pending_frame_host()->GetSiteInstance(); | 1554 site = child->render_manager()->pending_frame_host()->GetSiteInstance(); |
| 1555 } | 1555 } |
| 1556 EXPECT_NE(shell()->web_contents()->GetSiteInstance(), site); | 1556 EXPECT_NE(shell()->web_contents()->GetSiteInstance(), site); |
| 1557 | 1557 |
| 1558 std::string tree = base::StringPrintf( | 1558 std::string tree = base::StringPrintf( |
| 1559 " Site A ------------ proxies for B\n" | 1559 " Site A ------------ proxies for B\n" |
| 1560 " |--Site A ------- proxies for B\n" | 1560 " |--Site A ------- proxies for B\n" |
| 1561 " +--Site A (B %s)\n" | 1561 " +--Site A (B %s)\n" |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1595 TestNavigationObserver observer(shell()->web_contents()); | 1595 TestNavigationObserver observer(shell()->web_contents()); |
| 1596 TestFrameNavigationObserver navigation_observer(child); | 1596 TestFrameNavigationObserver navigation_observer(child); |
| 1597 NavigationController::LoadURLParams params(cross_site_url); | 1597 NavigationController::LoadURLParams params(cross_site_url); |
| 1598 params.transition_type = PageTransitionFromInt(ui::PAGE_TRANSITION_LINK); | 1598 params.transition_type = PageTransitionFromInt(ui::PAGE_TRANSITION_LINK); |
| 1599 params.frame_tree_node_id = child->frame_tree_node_id(); | 1599 params.frame_tree_node_id = child->frame_tree_node_id(); |
| 1600 child->navigator()->GetController()->LoadURLWithParams(params); | 1600 child->navigator()->GetController()->LoadURLWithParams(params); |
| 1601 | 1601 |
| 1602 SiteInstance* site2; | 1602 SiteInstance* site2; |
| 1603 if (browser_side_navigation) { | 1603 if (browser_side_navigation) { |
| 1604 site2 = child->render_manager() | 1604 site2 = child->render_manager() |
| 1605 ->speculative_frame_host_for_testing() | 1605 ->speculative_frame_host() |
| 1606 ->GetSiteInstance(); | 1606 ->GetSiteInstance(); |
| 1607 } else { | 1607 } else { |
| 1608 site2 = child->render_manager()->pending_frame_host()->GetSiteInstance(); | 1608 site2 = child->render_manager()->pending_frame_host()->GetSiteInstance(); |
| 1609 } | 1609 } |
| 1610 EXPECT_NE(shell()->web_contents()->GetSiteInstance(), site2); | 1610 EXPECT_NE(shell()->web_contents()->GetSiteInstance(), site2); |
| 1611 EXPECT_NE(site, site2); | 1611 EXPECT_NE(site, site2); |
| 1612 | 1612 |
| 1613 std::string tree = base::StringPrintf( | 1613 std::string tree = base::StringPrintf( |
| 1614 " Site A ------------ proxies for B C\n" | 1614 " Site A ------------ proxies for B C\n" |
| 1615 " |--Site A ------- proxies for B C\n" | 1615 " |--Site A ------- proxies for B C\n" |
| (...skipping 1074 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2690 " |--Site A\n" | 2690 " |--Site A\n" |
| 2691 " +--Site A\n" | 2691 " +--Site A\n" |
| 2692 " |--Site A\n" | 2692 " |--Site A\n" |
| 2693 " +--Site A\n" | 2693 " +--Site A\n" |
| 2694 " +--Site A\n" | 2694 " +--Site A\n" |
| 2695 "Where A = http://127.0.0.1/", | 2695 "Where A = http://127.0.0.1/", |
| 2696 DepictFrameTree(root)); | 2696 DepictFrameTree(root)); |
| 2697 } | 2697 } |
| 2698 | 2698 |
| 2699 } // namespace content | 2699 } // namespace content |
| OLD | NEW |