| Index: content/browser/frame_host/render_frame_host_manager.cc
|
| diff --git a/content/browser/frame_host/render_frame_host_manager.cc b/content/browser/frame_host/render_frame_host_manager.cc
|
| index 0dfdeaae6274c6845249c5eab665319a3083c627..948b0656e29dbd35181c4e8c73c7b8925c3b410e 100644
|
| --- a/content/browser/frame_host/render_frame_host_manager.cc
|
| +++ b/content/browser/frame_host/render_frame_host_manager.cc
|
| @@ -933,7 +933,8 @@ int RenderFrameHostManager::CreateRenderFrame(
|
| // gets a RenderViewHost in the SiteInstance of its opener WebContents.
|
| // If not used in the first navigation, this RVH is swapped out and is not
|
| // granted bindings, so we may need to grant them when swapping it in.
|
| - if (pending_web_ui() && !new_render_frame_host->GetProcess()->IsGuest()) {
|
| + if (pending_web_ui() &&
|
| + !new_render_frame_host->GetProcess()->IsIsolatedGuest()) {
|
| int required_bindings = pending_web_ui()->GetBindings();
|
| RenderViewHost* rvh = new_render_frame_host->render_view_host();
|
| if ((rvh->GetEnabledBindings() & required_bindings) !=
|
| @@ -1001,7 +1002,7 @@ bool RenderFrameHostManager::InitRenderView(RenderViewHost* render_view_host,
|
| // If the pending navigation is to a WebUI and the RenderView is not in a
|
| // guest process, tell the RenderViewHost about any bindings it will need
|
| // enabled.
|
| - if (pending_web_ui() && !render_view_host->GetProcess()->IsGuest()) {
|
| + if (pending_web_ui() && !render_view_host->GetProcess()->IsIsolatedGuest()) {
|
| render_view_host->AllowBindings(pending_web_ui()->GetBindings());
|
| } else {
|
| // Ensure that we don't create an unprivileged RenderView in a WebUI-enabled
|
| @@ -1355,7 +1356,8 @@ RenderFrameHostImpl* RenderFrameHostManager::UpdateStateForNavigate(
|
| SetPendingWebUI(entry);
|
|
|
| // Make sure the new RenderViewHost has the right bindings.
|
| - if (pending_web_ui() && !render_frame_host_->GetProcess()->IsGuest()) {
|
| + if (pending_web_ui() &&
|
| + !render_frame_host_->GetProcess()->IsIsolatedGuest()) {
|
| render_frame_host_->render_view_host()->AllowBindings(
|
| pending_web_ui()->GetBindings());
|
| }
|
|
|