| Index: content/browser/frame_host/render_frame_host_manager_browsertest.cc
|
| diff --git a/content/browser/frame_host/render_frame_host_manager_browsertest.cc b/content/browser/frame_host/render_frame_host_manager_browsertest.cc
|
| index 5e7ac6451fb623512dbe5fd56d5d4662c21c47bb..60ec78c345bc5ac29ac66d6194279d0fa7868b7f 100644
|
| --- a/content/browser/frame_host/render_frame_host_manager_browsertest.cc
|
| +++ b/content/browser/frame_host/render_frame_host_manager_browsertest.cc
|
| @@ -1544,18 +1544,14 @@ IN_PROC_BROWSER_TEST_F(RenderFrameHostManagerTest,
|
| shell()->web_contents()->GetRenderProcessHost()->GetID()));
|
| WebContentsImpl* web_contents = static_cast<WebContentsImpl*>(
|
| shell()->web_contents());
|
| - WebUIImpl* webui = web_contents->GetRenderManagerForTesting()->web_ui();
|
| + FrameTreeNode* root = web_contents->GetFrameTree()->root();
|
| + WebUIImpl* webui = root->current_frame_host()->web_ui();
|
| EXPECT_TRUE(webui);
|
| - EXPECT_FALSE(
|
| - web_contents->GetRenderManagerForTesting()->GetNavigatingWebUI());
|
|
|
| - // Navigate to another WebUI URL that reuses the WebUI object. Make sure we
|
| - // clear GetNavigatingWebUI() when it commits.
|
| + // Navigate to another WebUI URL that reuses the WebUI object.
|
| GURL webui_url2(webui_url.spec() + "#foo");
|
| NavigateToURL(shell(), webui_url2);
|
| - EXPECT_EQ(webui, web_contents->GetRenderManagerForTesting()->web_ui());
|
| - EXPECT_FALSE(
|
| - web_contents->GetRenderManagerForTesting()->GetNavigatingWebUI());
|
| + EXPECT_EQ(webui, root->current_frame_host()->web_ui());
|
| }
|
|
|
| class RFHMProcessPerTabTest : public RenderFrameHostManagerTest {
|
|
|