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

Unified Diff: content/browser/site_per_process_browsertest.cc

Issue 72233002: Move RenderViewHostManager from WebContents to FrameTreeNode. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Initial patch Created 7 years, 1 month 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
Index: content/browser/site_per_process_browsertest.cc
diff --git a/content/browser/site_per_process_browsertest.cc b/content/browser/site_per_process_browsertest.cc
index 72de096a7b0609bef78391c1d362e1c1d620a043..bfe0dcc67c0277ba80417c3772c333f073b2a34a 100644
--- a/content/browser/site_per_process_browsertest.cc
+++ b/content/browser/site_per_process_browsertest.cc
@@ -420,7 +420,7 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest,
NavigateToURL(shell(), base_url.Resolve("blank.html"));
FrameTreeNode* root =
static_cast<WebContentsImpl*>(shell()->web_contents())->
- GetFrameTree()->GetRootForTesting();
+ GetFrameTree()->root();
EXPECT_EQ(0U, root->child_count());
// Add 2 same-site frames. Verify 3 nodes in tree with proper names.
@@ -451,7 +451,7 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest,
WebContentsImpl* wc = static_cast<WebContentsImpl*>(shell()->web_contents());
RenderViewHostImpl* rvh = static_cast<RenderViewHostImpl*>(
wc->GetRenderViewHost());
- FrameTreeNode* root = wc->GetFrameTree()->GetRootForTesting();
+ FrameTreeNode* root = wc->GetFrameTree()->root();
// Check that the root node is properly created with the frame id of the
// initial navigation.
@@ -473,7 +473,7 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest,
// tree in the browser process.
NavigateToURL(shell(), test_server()->GetURL("files/title1.html"));
- root = wc->GetFrameTree()->GetRootForTesting();
+ root = wc->GetFrameTree()->root();
EXPECT_EQ(0UL, root->child_count());
EXPECT_EQ(std::string(), root->frame_name());
EXPECT_EQ(rvh->main_frame_id(), root->frame_id());

Powered by Google App Engine
This is Rietveld 408576698