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

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

Issue 1142123002: Remove swapped-out usage in --site-per-process. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Another round of fixes. Created 5 years, 6 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
OLDNEW
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 989 matching lines...) Expand 10 before | Expand all | Expand 10 after
1000 IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, 1000 IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest,
1001 KillingRendererClearsDescendantProxies) { 1001 KillingRendererClearsDescendantProxies) {
1002 GURL main_url(embedded_test_server()->GetURL( 1002 GURL main_url(embedded_test_server()->GetURL(
1003 "a.com", "/frame_tree/page_with_two_frames_nested.html")); 1003 "a.com", "/frame_tree/page_with_two_frames_nested.html"));
1004 NavigateToURL(shell(), main_url); 1004 NavigateToURL(shell(), main_url);
1005 1005
1006 // It is safe to obtain the root frame tree node here, as it doesn't change. 1006 // It is safe to obtain the root frame tree node here, as it doesn't change.
1007 FrameTreeNode* root = 1007 FrameTreeNode* root =
1008 static_cast<WebContentsImpl*>(shell()->web_contents())-> 1008 static_cast<WebContentsImpl*>(shell()->web_contents())->
1009 GetFrameTree()->root(); 1009 GetFrameTree()->root();
1010 TestNavigationObserver observer(shell()->web_contents());
1011
1012 ASSERT_EQ(2U, root->child_count()); 1010 ASSERT_EQ(2U, root->child_count());
1013 1011
1014 GURL site_b_url( 1012 GURL site_b_url(
1015 embedded_test_server()->GetURL( 1013 embedded_test_server()->GetURL(
1016 "bar.com", "/frame_tree/page_with_one_frame.html")); 1014 "bar.com", "/frame_tree/page_with_one_frame.html"));
1017 // We can't use a TestNavigationObserver to verify the URL here, 1015 // We can't use a TestNavigationObserver to verify the URL here,
1018 // since the frame has children that may have clobbered it in the observer. 1016 // since the frame has children that may have clobbered it in the observer.
1019 EXPECT_EQ(site_b_url, root->child_at(0)->current_url()); 1017 EXPECT_EQ(site_b_url, root->child_at(0)->current_url());
1020 1018
1021 // Ensure that a new process is created for node2. 1019 // Ensure that a new process is created for node2.
(...skipping 1506 matching lines...) Expand 10 before | Expand all | Expand 10 after
2528 " |--Site A\n" 2526 " |--Site A\n"
2529 " +--Site A\n" 2527 " +--Site A\n"
2530 " |--Site A\n" 2528 " |--Site A\n"
2531 " +--Site A\n" 2529 " +--Site A\n"
2532 " +--Site A\n" 2530 " +--Site A\n"
2533 "Where A = http://127.0.0.1/", 2531 "Where A = http://127.0.0.1/",
2534 DepictFrameTree(root)); 2532 DepictFrameTree(root));
2535 } 2533 }
2536 2534
2537 } // namespace content 2535 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/renderer_host/render_view_host_impl.cc ('k') | content/browser/web_contents/web_contents_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698