Index: content/browser/frame_host/render_frame_host_manager_unittest.cc |
diff --git a/content/browser/frame_host/render_frame_host_manager_unittest.cc b/content/browser/frame_host/render_frame_host_manager_unittest.cc |
index c2a70b1e5217b30adc720d3fb16da13e4e98e187..bb3efd336cbfdd7e24f93dc3db5dcbaf7dd383ba 100644 |
--- a/content/browser/frame_host/render_frame_host_manager_unittest.cc |
+++ b/content/browser/frame_host/render_frame_host_manager_unittest.cc |
@@ -1097,7 +1097,7 @@ TEST_F(RenderFrameHostManagerTest, WebUI) { |
RenderFrameHostImpl* initial_rfh = manager->current_frame_host(); |
EXPECT_FALSE(manager->current_host()->IsRenderViewLive()); |
- EXPECT_FALSE(manager->web_ui()); |
+ EXPECT_FALSE(manager->current_frame_host()->web_ui()); |
EXPECT_TRUE(initial_rfh); |
const GURL kUrl("chrome://foo"); |
@@ -1124,8 +1124,7 @@ TEST_F(RenderFrameHostManagerTest, WebUI) { |
// The Web UI is committed immediately because the RenderViewHost has not been |
// used yet. UpdateStateForNavigate() took the short cut path. |
- EXPECT_FALSE(manager->GetNavigatingWebUI()); |
- EXPECT_TRUE(manager->web_ui()); |
+ EXPECT_TRUE(manager->current_frame_host()->web_ui()); |
// Commit. |
manager->DidNavigateFrame(host, true); |
@@ -1194,7 +1193,7 @@ TEST_F(RenderFrameHostManagerTest, WebUIInNewTab) { |
// No cross-process transition happens because we are already in the right |
// SiteInstance. We should grant bindings immediately. |
EXPECT_EQ(host2, manager2->current_frame_host()); |
- EXPECT_TRUE(manager2->GetNavigatingWebUI()); |
+ EXPECT_TRUE(host2->web_ui()); |
EXPECT_TRUE( |
host2->render_view_host()->GetEnabledBindings() & BINDINGS_POLICY_WEB_UI); |
@@ -1208,16 +1207,14 @@ TEST_F(RenderFrameHostManagerTest, WebUIWasReused) { |
// Navigate to a WebUI page. |
const GURL kUrl1("chrome://foo"); |
contents()->NavigateAndCommit(kUrl1); |
- RenderFrameHostManager* manager = |
- main_test_rfh()->frame_tree_node()->render_manager(); |
- WebUIImpl* web_ui = manager->web_ui(); |
+ WebUIImpl* web_ui = main_test_rfh()->web_ui(); |
EXPECT_TRUE(web_ui); |
// Navigate to another WebUI page which should be same-site and keep the |
// current WebUI. |
const GURL kUrl2("chrome://foo/bar"); |
contents()->NavigateAndCommit(kUrl2); |
- EXPECT_EQ(web_ui, manager->web_ui()); |
+ EXPECT_EQ(web_ui, main_test_rfh()->web_ui()); |
} |
// Tests that a WebUI is correctly cleaned up when navigating from a chrome:// |
@@ -1228,12 +1225,12 @@ TEST_F(RenderFrameHostManagerTest, WebUIWasCleared) { |
// Navigate to a WebUI page. |
const GURL kUrl1("chrome://foo"); |
contents()->NavigateAndCommit(kUrl1); |
- EXPECT_TRUE(main_test_rfh()->frame_tree_node()->render_manager()->web_ui()); |
+ EXPECT_TRUE(main_test_rfh()->web_ui()); |
// Navigate to a non-WebUI page. |
const GURL kUrl2("http://www.google.com"); |
contents()->NavigateAndCommit(kUrl2); |
- EXPECT_FALSE(main_test_rfh()->frame_tree_node()->render_manager()->web_ui()); |
+ EXPECT_FALSE(main_test_rfh()->web_ui()); |
} |
// Tests that we don't end up in an inconsistent state if a page does a back and |