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

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

Issue 2566583002: Change allowed bindings to be per RenderFrame instead of per RenderView. (Closed)
Patch Set: Created 4 years 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 f30d331b88ced2fe98878bbaad2bd1404257f4ab..286fb8c1fb11d3b1cccf0240d84f8bbbe4c354bf 100644
--- a/content/browser/frame_host/render_frame_host_manager_browsertest.cc
+++ b/content/browser/frame_host/render_frame_host_manager_browsertest.cc
@@ -1831,7 +1831,7 @@ IN_PROC_BROWSER_TEST_F(RenderFrameHostManagerTest, WebUIGetsBindings) {
GetRenderManagerForTesting()->GetSwappedOutRenderViewHost(site_instance1);
ASSERT_TRUE(initial_rvh);
// The following condition is what was causing the bug.
- EXPECT_EQ(0, initial_rvh->GetEnabledBindings());
+ // EXPECT_EQ(0, initial_rvh->GetMainFrame()->GetEnabledBindings());
Charlie Reis 2016/12/16 01:01:52 Shouldn't comment this line out.
Sam McNally 2017/01/12 09:27:08 So it turns out that this RVH doesn't have a Rende
// Navigate to url1 and check bindings.
NavigateToURL(new_shell, url1);
@@ -1839,7 +1839,7 @@ IN_PROC_BROWSER_TEST_F(RenderFrameHostManagerTest, WebUIGetsBindings) {
// |initial_rvh| did not have a chance to be used.
EXPECT_EQ(new_web_contents->GetSiteInstance(), site_instance1);
EXPECT_EQ(BINDINGS_POLICY_WEB_UI,
- new_web_contents->GetRenderViewHost()->GetEnabledBindings());
+ new_web_contents->GetMainFrame()->GetEnabledBindings());
}
// crbug.com/424526

Powered by Google App Engine
This is Rietveld 408576698