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

Unified Diff: content/browser/frame_host/render_frame_host_manager_browsertest.cc

Issue 1426403006: Reland #1 of: Move WebUI ownership from the RenderFrameHostManager to the RenderFrameHost. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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/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 d06b2ff90bf93016c2dc38e9987dd57835be31d1..5e7ac6451fb623512dbe5fd56d5d4662c21c47bb 100644
--- a/content/browser/frame_host/render_frame_host_manager_browsertest.cc
+++ b/content/browser/frame_host/render_frame_host_manager_browsertest.cc
@@ -1546,14 +1546,16 @@ IN_PROC_BROWSER_TEST_F(RenderFrameHostManagerTest,
shell()->web_contents());
WebUIImpl* webui = web_contents->GetRenderManagerForTesting()->web_ui();
EXPECT_TRUE(webui);
- EXPECT_FALSE(web_contents->GetRenderManagerForTesting()->pending_web_ui());
+ EXPECT_FALSE(
+ web_contents->GetRenderManagerForTesting()->GetNavigatingWebUI());
// Navigate to another WebUI URL that reuses the WebUI object. Make sure we
- // clear pending_web_ui() when it commits.
+ // clear GetNavigatingWebUI() when it commits.
GURL webui_url2(webui_url.spec() + "#foo");
NavigateToURL(shell(), webui_url2);
EXPECT_EQ(webui, web_contents->GetRenderManagerForTesting()->web_ui());
- EXPECT_FALSE(web_contents->GetRenderManagerForTesting()->pending_web_ui());
+ EXPECT_FALSE(
+ web_contents->GetRenderManagerForTesting()->GetNavigatingWebUI());
}
class RFHMProcessPerTabTest : public RenderFrameHostManagerTest {

Powered by Google App Engine
This is Rietveld 408576698